diff options
| author | Jordan Liu <jminjie@google.com> | 2020-12-22 06:52:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 06:52:55 +0000 |
| commit | 539b63be5c373f71961997f14bf77ff999792280 (patch) | |
| tree | a4d56dcd01c4d8287b8dba1717c5d44b95238dd1 /tools/aapt2/diff/Diff.cpp | |
| parent | f3b109bc5cd82aa67bbea309efb333a1993f0703 (diff) | |
| parent | 0f98d573294ddc5f9524c2b718278f4f218a3fd3 (diff) | |
[automerger skipped] Merge "DO NOT MERGE add android.permission.STATUS_BAR for cellbroadcastreceiver" into rvc-qpr-dev am: 5b48739837 am: 0f98d57329 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13237574
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a0e6f2f18cd4f7bafbcc76c619544e058ba8d6f
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions