summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-12-02 01:35:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-02 01:35:08 +0000
commit33c5864ab54171ec7d5f493bae9c690d4bb0377a (patch)
tree1e09c54e00c04664fe41de47c7cb8ebb5f95877c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent55f1a71cb615b20dbe5d82c4497a0f2ba961e239 (diff)
parentb3bd1acb092510cf7f5f3f86258e96725b79741c (diff)
Merge "Revert "Revert "Restore preferred activity filter if it not inside""" am: 406e3a063d am: b3bd1acb09
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504108 Change-Id: I085cf33e85d61915886cf86a46f0a92d38c54966
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions