diff options
author | Jeffrey Carlyle <jcarlyle@google.com> | 2020-08-14 03:18:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-14 03:18:59 +0000 |
commit | 46b29daa0d5844598eead404f181afeb3527b24d (patch) | |
tree | efc04b4ddddd3f2f88031e9fcb64229e7f5d9194 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | afc4ef7cdc76441192ef7f3b5999245e7882f440 (diff) | |
parent | 8c2b879a3c79083c5575d9adc832237de0f598f4 (diff) |
[automerger skipped] Merge "allow KeyguardIndicationController to be more easily overriden" into rvc-qpr-dev am: b1012032d3 am: 8c2b879a3c -s ours
am skip reason: Change-Id Iccbeaa527014abc00107ea1165f93330d80c3791 with SHA-1 1463e18d20 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12153272
Change-Id: I0be4ce594309865545dd53f3a20a6b80d7b3c180
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions