diff options
author | Kholoud Mohamed <kholoudm@google.com> | 2021-09-09 16:22:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-09 16:22:16 +0000 |
commit | 6dee831f1226d5209dbe924627ded0cff7f03963 (patch) | |
tree | 40bd672112e65ad98d4ed5c2e1812db2547d1ff7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | efe21c91998dd9a3e4668d9a7f9aba0a2d35ab1f (diff) | |
parent | b406329f6baf8d4a20082dffc1919c4c51e3d226 (diff) |
[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd -s ours am: 585320a3e1 -s ours am: 5361a95cf7 -s ours am: b406329f6b -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: I36b6ffadfe5811c39e1eb1113aa4502d0d8cc7dc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions