summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2016-06-06 23:55:58 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-06 23:55:58 +0000
commitd9a7b1e07bc9961496d7f944222a617d438a9507 (patch)
tree2aca048ce60d495cb8a242da772df8086216cc3e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent9b75a6c266b8fa2c91e5d01bc290e2919ecb6233 (diff)
parentabb74889982603f6070100033c8fa2b1eef3d8de (diff)
Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev am: fe3ecdab1b
am: abb7488998 * commit 'abb74889982603f6070100033c8fa2b1eef3d8de': Revert "Internal API for cross-task Activity used by assistant." Change-Id: Id397afe9221e2562e096befc1b105233618ca7ef
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions