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