summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2015-03-19 00:32:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-19 00:32:17 +0000
commitd8379b907f0b0b9778f90e0b5e6c1c5736b4b881 (patch)
tree8aaa39945baf094a7c2237fa2343bdd3dd6916f1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4a4be5d93a38df016097dad8b84d3324bb6736ad (diff)
parent8b8a045133e0466e964b4094269585708805b90a (diff)
am 8b8a0451: am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev
* commit '8b8a045133e0466e964b4094269585708805b90a': Add Assist global action for wear to different from VOICE_ASSIST
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions