summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2017-07-26 04:09:05 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-26 04:09:05 +0000
commit9d35a1ee6b25cddf2b9ef931a07e535f5e174bb5 (patch)
tree1b25178a22ba8f3a3151fbad2b4ffe03846d8923 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta9a5c9f017fcedf08b38f368bfe9dd52c594b221 (diff)
parente31847642c3bf4ed0f5947ac52b09d55c694561e (diff)
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev
am: e31847642c Change-Id: Ida93e02bae4e099ae20d2db7bd0d3efb774a546c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions