diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-09 22:23:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 22:23:57 +0000 |
| commit | ebce21c0b5dfd8b5d410ae510242c04055c6fa8f (patch) | |
| tree | d3b0c3193695860a5aa327b39581131e7fc2357a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0c1fc57256feda9c905f3208701e7cecd299a66c (diff) | |
| parent | d6b88794f1b9f8d90ff87988ef240b8a2faa2799 (diff) | |
[automerger skipped] Merge "Allow automatic unlocking of work profile by Digital Wellbeing" into rvc-dev am: 54c8e6a9a4 am: bcf308d1fc am: 4e7266d517 am: d6b88794f1 -s ours
am skip reason: Change-Id I4d241a4d7f11817f5171c5b064c379ff17aeaa43 with SHA-1 cebb45df33 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11721687
Change-Id: I3d1b568f6347cf895afd19ffec084ddf516b33e4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions