summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-12-29 01:59:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-29 01:59:28 +0000
commitebc440ea5d97d1e3424c4aa636311ab8ec494e76 (patch)
treebac284fab8a48e5f5110aa2f4d32669d2d098a71 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentaa5adac6d207bec7d52f3336ff25e344efcd8f6e (diff)
parent3551ce9d8e8244376d63b65e0352ffa03198ba2a (diff)
am 443d1a6a: am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible"
automerge: 3551ce9 * commit '3551ce9d8e8244376d63b65e0352ffa03198ba2a': [ActivityManager] Reset ActivityRecord's waitingVisible
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions