summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2015-01-22 00:29:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-22 00:29:56 +0000
commitd56352dbcb447ed0a93f2d46183e6217800add80 (patch)
tree3fe5eda766c06e3f5741500d5c6f04bf9eaf7d6b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent9e7cb40ddf055ecf1033555bd9ed90922a3cfa9b (diff)
parentc79a8ea0c4e1cb30c667f84276820f7e14bfb3b1 (diff)
am c79a8ea0: Merge "Resume home activity can skip resume and cause ANR. DO NOT MERGE" into lmp-mr1-dev
* commit 'c79a8ea0c4e1cb30c667f84276820f7e14bfb3b1': Resume home activity can skip resume and cause ANR. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions