summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorErik Wolsheimer <ewol@google.com>2016-10-21 17:46:06 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-21 17:46:06 +0000
commit10842783e1955c4a0aa2e640cd4531b17a0b4b1d (patch)
tree7f4d88d2502d56fda0d4ab10a73761b81704688f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent26fd414ce589f05cec1b869835582c9df4715ee0 (diff)
parent7d81fa03fa18c3393dbdd18f4b79156a1834b967 (diff)
Merge "DO NOT MERGE ANYWHERE Allow Wear Home app to send wallpaper commands at any time" into cw-f-dev am: 653b982d18 -s ours
am: 7d81fa03fa -s ours Change-Id: Ia014c890c267b4b3bf364ecfeea72892d8c11fba
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions