summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-08 23:02:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-08 23:02:27 +0000
commitb222bda6914a5df1ca0488df1f78cda556b2ad22 (patch)
tree03bb5211b38bf5936f8e9025d3c7244306478dae /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc9162a9fa85ace0ef41797ddff348b8b5fce108b (diff)
parent41c720fac609f46c038b12b1d4e4c9211677f31f (diff)
Merge "Merge "Load owner info during DevicePolicyManagerSerivce construction" into rvc-dev am: 8d357b55ca am: 528c804df2 am: 1966d79a17" into rvc-qpr-dev-plus-aosp am: 41c720fac6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11680847 Change-Id: Ia02671aa5c118fe93c59461b0e264188da47ebe5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions