diff options
| author | Sarah Chin <sarahchin@google.com> | 2020-06-23 18:10:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:10:24 +0000 |
| commit | 1b90a57ee444b88770003b30ca869e60712554aa (patch) | |
| tree | abda1544041e091029c5fc06cdf4c485aef40428 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b0eaff92c18a769198dc3204413fefbbacd2514c (diff) | |
| parent | cdde89f06da9ef489728c8a9c1abec7131f88879 (diff) | |
[automerger skipped] Merge "Add Setting for NR screen off indications" am: b12ae89571 am: cdde89f06d -s ours
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: I5188310bfbe038427535aab9269731747a79424d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions