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