diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 17:20:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 17:20:53 +0000 |
commit | 88975abd896283543b4080b16542a7eef55305a7 (patch) | |
tree | f06ffd21c669877da1b064fce6b907aee8eb3dca /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | caaebbfc8e8c27e8988c17ab76d85ca78754794e (diff) | |
parent | 7034afaec9b2723dc4b53d1a1f68efefe96f6030 (diff) |
Merge "Merge "Prevent system reset staged installer bypass flag unexpactly" into rvc-dev am: 809bf93563 am: d03b501796 am: 6a0ff25f9a" into rvc-qpr-dev-plus-aosp am: 7034afaec9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12106109
Change-Id: I90e0bb48d8bdd26721af22b73d71e789853b9011
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions