summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMichael Kwan <mkwan@google.com>2016-11-04 20:06:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-04 20:06:22 +0000
commit3045e6a3c7552ea9247c6a002c831de11f124f10 (patch)
tree599cf82dc31e07cdd1a93259c9d78ee90924511d /tools/aapt2/java/JavaClassGenerator_test.cpp
parentaa3e93e39774e80ace0e1c905c521f57a53d7e95 (diff)
parent0c94d19c5db0e847d4a8b14cc2ca7cb0887547fe (diff)
Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev am: eed332bada -s ours
am: 0c94d19c5d -s ours Change-Id: I767afec1a2633ac5fd5daf8b4cceeb8169a22bbe
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions