summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSongchun Fan <schfan@google.com>2020-11-17 19:05:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-17 19:05:48 +0000
commita20b451cf44e13bdddb5ad8dcafa13fc8aee2cc7 (patch)
tree4e185840a31c9c4e8287961ea580b3e68ca8bd8a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8977d2d41c29253a7ac482f6764ca9d889b1af63 (diff)
parentfcf66c36d862b5fd759b5526dfea392b3b82c9d9 (diff)
Merge "Restore preferred activity filter if it not inside" am: d8c6106f91 am: d45305b25c am: fcf66c36d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483964 Change-Id: Id355bc9a72696904b0ea2739e12f4ff4af1a2370
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions