diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 22:24:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 22:24:56 +0000 |
| commit | fe81293c004222eabceb2fa033f32d4e9919e19e (patch) | |
| tree | d3b0c3193695860a5aa327b39581131e7fc2357a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 73e2dc27865c10438a42fcc58e5d4699ca5350d2 (diff) | |
| parent | 4ec7bbb912856b12a7928297f889e865a11a5dfe (diff) | |
[automerger skipped] Merge "Merge "Allow automatic unlocking of work profile by Digital Wellbeing" into rvc-dev am: 54c8e6a9a4 am: 9fb5102197" into rvc-d1-dev-plus-aosp am: 6561863a8d -s ours am: 4ec7bbb912 -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: I534034d252e7c4517d33c8e0fbe0be59d0e6674a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions