diff options
| author | Chris Tate <ctate@android.com> | 2021-04-27 22:22:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-27 22:22:30 +0000 |
| commit | 91fbccc817592baa522f5df3c3400108b056bb2c (patch) | |
| tree | d1c055c9a4dc4dd12cb8d50184d89597c3d63368 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | eff05e86d304c2ea28eded8b435eec128efb73e5 (diff) | |
| parent | 22feb668e8a37d9c38af978b38f58eba01f339c8 (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into oc-mr1-dev am: 6cc887c00d -s ours am: 2bec84a794 -s ours am: 9cd02f1d7f am: 22feb668e8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13779450
Change-Id: I9c77d745a97304c67aa80741298b3d539eaa85f1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions