diff options
author | Chris Tate <ctate@android.com> | 2021-04-27 22:20:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 22:20:04 +0000 |
commit | 0dbc306379ce012757242abb7ed81b7e7777123a (patch) | |
tree | d1c055c9a4dc4dd12cb8d50184d89597c3d63368 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 11f4032b5ed58ac6309dec64694ad1ddad019f27 (diff) | |
parent | 05dd5f18e39e2b34eb8a2901b56b54d4e1d54446 (diff) |
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into qt-dev am: 7b0067c950 am: 05dd5f18e3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411
Change-Id: Ia646150ba7ecb4342542dc3601789b056fb91710
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions