diff options
author | Chris Tate <ctate@android.com> | 2021-04-06 17:40:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-06 17:40:47 +0000 |
commit | f906029106c2fa26d47a4f23a61cd0f4035280b2 (patch) | |
tree | 7cb7fff2996875fb2bdb504618cf36db3265f976 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | edd6e60bad6971ec941bd112b0ee7d876bbfd3ed (diff) | |
parent | d894cc9d019478fa8c62844942e5df1e78f5bca0 (diff) |
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-dev am: 68a604b920 am: d894cc9d01 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533155
Change-Id: I903ac9bf138060243cfaa744f244b039451a0916
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions