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