diff options
| author | Jovana Knezevic <jovanak@google.com> | 2019-11-22 08:55:27 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-22 08:55:27 -0800 |
| commit | be80fc48df69446f7c2a6d43bd123e45f4be5c78 (patch) | |
| tree | ee3a309e4ba823d90944a9f0e69de52d0ff40406 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0f97261406c20491284e7335b8a160097bfbec30 (diff) | |
| parent | d7353d5c33b02237d749424356229f5322808088 (diff) | |
Merge "Keyguard should be dismissed if there is no trusted device." into qt-qpr1-dev
am: d7353d5c33
Change-Id: I37a5f7edc56db4ac33a9ad8a1ea43354c2abd655
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions