diff options
| author | Jordan Liu <jminjie@google.com> | 2019-10-18 16:52:38 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-18 16:52:38 -0700 |
| commit | 04aed6a038d3c85c4baf52b0f48c143d5d707f48 (patch) | |
| tree | 0bf81f75d02eb0f0ff999d25bc6aff1a08a6b612 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4b8559d6043a64706146c669e020d362372d386b (diff) | |
| parent | 33cf9d6cfe3719ccb41025980ec59b17c6edc124 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Add CellBroadcastService and related permissions" am: 6af905e0fe am: 09a3b50108 am: e74e608513
am: 33cf9d6cfe -s ours
am skip reason: subject contains skip directive
Change-Id: Ice5ac53cc8894844026ef5a03b6b433bea9cb45b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions