diff options
| author | Steve Elliott <steell@google.com> | 2019-11-21 09:48:37 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-21 09:48:37 -0800 |
| commit | 9ea42174308556341c49ed47c803eb11f3e44b80 (patch) | |
| tree | 77695280646ade632e2ebbf72c621622d5ae3e5c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a51da7900bf6cfa9242053eddef38af16a4e20d0 (diff) | |
| parent | 3d0216caa5a8b73bc9099bd4e8d21b367eee97de (diff) | |
[automerger skipped] Merge "DO NOT MERGE: Properly reflect device lock state in Global Action panel." into qt-qpr1-dev am: 893a2b05a5
am: 3d0216caa5 -s ours
am skip reason: subject contains skip directive
Change-Id: I0d3dedbffeaf6d21228f69297e63afb785af7160
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions