diff options
| author | Tobias Thierer <tobiast@google.com> | 2020-12-14 14:14:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-14 14:14:47 +0000 |
| commit | 1c82ef49285e7a9ddddd7c2c6107eca1a40eecba (patch) | |
| tree | da2a8ada64dcb86be49416c2e5b8e9818d8c717b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 76b105c20aecdb5005b4455248671dd2bc69167c (diff) | |
| parent | 413001ee8db2a03864982945edc57bfd42353690 (diff) | |
[automerger skipped] Merge "Fix DevicePolicyManager.isBackupServiceEnabled() breakage." into rvc-qpr-dev-plus-aosp am: 413001ee8d -s ours
am skip reason: Change-Id I11d863229c4d62a058aaf37446a694b9c73ae5b8 with SHA-1 630dec9eb4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I440b845e3afbd0dfd8fbb58c11262e8149ec543d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions