diff options
| author | Jovana Knezevic <jovanak@google.com> | 2019-11-25 07:21:52 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-25 07:21:52 -0800 |
| commit | 3c9e76327f349996f9ce51a6c9fd1b4bbec35ef2 (patch) | |
| tree | 913018cd37e8299d5b329e70074dd29b4e437850 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 534c700111088b4e9e77f51119d8ca9e25290cc0 (diff) | |
| parent | be80fc48df69446f7c2a6d43bd123e45f4be5c78 (diff) | |
[automerger skipped] Merge "Keyguard should be dismissed if there is no trusted device." into qt-qpr1-dev am: d7353d5c33
am: be80fc48df -s ours
am skip reason: change_id I9e3c1138813ba40f0c6b2e8cba057b99ff6fb040 with SHA1 ff3328346d is in history
Change-Id: Iab6981d589070554fc145944f25b6dbef9a5c7ce
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions