diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 22:24:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 22:24:25 +0000 |
| commit | 73e2dc27865c10438a42fcc58e5d4699ca5350d2 (patch) | |
| tree | d3b0c3193695860a5aa327b39581131e7fc2357a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ebce21c0b5dfd8b5d410ae510242c04055c6fa8f (diff) | |
| parent | 273918bdb539831d865037934890bde20d128709 (diff) | |
[automerger skipped] Merge "Merge "Allow automatic unlocking of work profile by Digital Wellbeing" into rvc-dev am: 54c8e6a9a4 am: 9fb5102197 am: b0b1563009" into rvc-qpr-dev-plus-aosp am: 273918bdb5 -s ours
am skip reason: Change-Id I4d241a4d7f11817f5171c5b064c379ff17aeaa43 with SHA-1 a8c58f06d0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11721687
Change-Id: Iaea523667016f0d97e10878c8880e7687eb2426e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions