[automerger skipped] Merge "Add Setting for NR screen off indications" am: b12ae89571 am: cdde89f06d -s ours am: 1b90a57ee4 -s ours

Browse Source

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

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

Change-Id: Idbf8a274e5081f0ebaa5101d30107dc4de061fd0

...

This commit is contained in:

Sarah Chin

2020-06-23 18:11:02 +00:00

committed by Automerger Merge Worker

parent deb73e8877 1b90a57ee4

commit 74c0253bfa

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available