diff options
author | Steve Elliott <steell@google.com> | 2019-11-21 09:45:39 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-21 09:45:39 -0800 |
commit | a51da7900bf6cfa9242053eddef38af16a4e20d0 (patch) | |
tree | 77695280646ade632e2ebbf72c621622d5ae3e5c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | de887b35a64b9a8815115ca900e8e6fdad7b54ec (diff) | |
parent | afe77db9e49e58459ae93c00a12ec3bd2955f149 (diff) |
[automerger skipped] DO NOT MERGE: Properly reflect device lock state in Global Action panel. am: db386ab068
am: afe77db9e4 -s ours
am skip reason: subject contains skip directive
Change-Id: I96808898534d802925103e11da08e1cc92fef04f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions