diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 22:13:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 22:13:03 +0000 |
| commit | 4ec7bbb912856b12a7928297f889e865a11a5dfe (patch) | |
| tree | cde32cc5aa30df1f4ff9d0f11c263471b00426f6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 273918bdb539831d865037934890bde20d128709 (diff) | |
| parent | 6561863a8df94246f2773d23da32e57738df0b1d (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 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: I6e33a60ead7994d1604f9837e29949d6fbda8019
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions