Skip to content
Commit 1b90a57e authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add Setting for NR screen off indications" am:... 

[automerger skipped] Merge "Add Setting for NR screen off indications" am: b12ae895 am: cdde89f0 -s ours

am skip reason: Change-Id Ifa485230f6d27eaa7a665a396e3eac33e00feadb with SHA-1 6c283739 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1346644

Change-Id: I5188310bfbe038427535aab9269731747a79424d
parents b0eaff92 cdde89f0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment