summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2017-08-31 23:44:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-31 23:44:43 +0000
commitf9ddd9781560a9a654a03ee6f983f486c2a2163d (patch)
treeef8a0e6658fbfae507a1242a134362a84dd2324a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent449a8560fbb5d516cbf242ec75cd181749d43e55 (diff)
parent8e2615c372018ac033f64c63b78174b1bc9dcdce (diff)
Merge "Fix transition between two occluding activities" into oc-mr1-dev
am: 8e2615c372 Change-Id: I9671da6a339c64369504450bfff48d48a1942aa2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions