diff options
| author | Sarah Chin <sarahchin@google.com> | 2020-06-23 18:32:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:32:43 +0000 |
| commit | 6432d408c975db774c7aa0d05d104cd04ed2dcc8 (patch) | |
| tree | a34ceda6fdbc602f446666f19dc10876b58599e1 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | fb26dbe38916b7a65c3138a71bbf71f2b1aecfbc (diff) | |
| parent | 74c0253bfadfb1a412fffcdccfb7ffce60a93d70 (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 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: I7d66a521de22ca094579735521f0f743d87c41f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions