diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 16:22:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 16:22:30 +0000 |
| commit | 471ebc97c49cbdda2c3b9b29c9326759045ed310 (patch) | |
| tree | 40bd672112e65ad98d4ed5c2e1812db2547d1ff7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6dee831f1226d5209dbe924627ded0cff7f03963 (diff) | |
| parent | fe0e3e345451fc5775df118a23d142b0dc761b1d (diff) | |
Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd am: 12d71bb87b -s ours" into sc-dev am: 4d117fd380 -s ours am: fe0e3e3454 -s ours
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15454356
Change-Id: I0f39a9d6fadb3b0c9e98ed0fbdc0ae471d7cdb6b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions