summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2015-01-27 15:15:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-27 15:15:38 +0000
commitfff84a232a964a8587eabee4e34cc38344309593 (patch)
tree12dbc7610b5e434d9e7c4d58091274b06c5d9fa8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb84e0040d8c2f44790e7ceeda8cddf3524f33d29 (diff)
parentaa6945ac7904611499ae4ad33799d1f1fe434d32 (diff)
Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev
automerge: aa6945a * commit 'aa6945ac7904611499ae4ad33799d1f1fe434d32': Activity Transition: fix quick back after enter.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions