diff options
author | Patrick Baumann <patb@google.com> | 2020-07-24 21:25:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-24 21:25:39 +0000 |
commit | ecc3406730e8317b8c36129732d265c7f52fad53 (patch) | |
tree | 90c9fab68609177d1e954eca5daf5c30fe4e7612 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a7940c332c8809d00c4831ed2f0f5917a2481498 (diff) | |
parent | 5d1c271b1c2a344bbe0ce2159e86dfe85782ee62 (diff) |
Merge "Fix unintended preferred activity reset" into rvc-dev am: 69b18e57fc am: b09e002838 am: 5d1c271b1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12220605
Change-Id: I4ab7bd24f99c89bbb086c1ee51b9833fc15571bd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions