diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 17:15:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 17:15:34 +0000 |
commit | 737f03a72083c6c6cfd6ed13867605b8e8b2d547 (patch) | |
tree | 5c401b9ece9d7da5ac6227588ce094391b2b692f /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | d3ccbe880bcfe48cdaa2c5238f330030fb7f1d23 (diff) | |
parent | 90aa4df91e74ded621f4894c68977c6b1f5c8638 (diff) |
Merge "Merge "Notify that keyguard is dismissed when user is unlocked" into rvc-dev am: 6c85a4aceb am: 5a5da871ec am: 7576f12f38" into rvc-qpr-dev-plus-aosp am: 90aa4df91e
Change-Id: I928eba625df82d74918922971608b906c8a835b1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions