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