diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-05 18:12:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 18:12:46 +0000 |
| commit | 97f5d2895c6ba5d9910af261fb64414a1627bd61 (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 885328640f67443a4d4e393f8074cb4aadb94757 (diff) | |
| parent | 7de4a496cdf8e5d64acf02631832558caa49d927 (diff) | |
[automerger skipped] Merge "Add privapp permissions permission for com.android.cellbroadcastreceiver package." am: fb723fabac am: b65eff6a29 -s ours am: 08fbfc8272 -s ours am: cdd4451421 -s ours am: 7de4a496cd -s ours
am skip reason: Change-Id I7fd5080aa740fcfcebeb4f934d0a3fc39d847cc9 with SHA-1 8fe5465ada is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352924
Change-Id: Idd059aca569300d7be4f78adbcafa59f8fe0b827
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions