diff options
author | Winson Chung <winsonc@google.com> | 2017-07-26 04:16:30 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 04:16:30 +0000 |
commit | b179eac2b8746ffc34ad159738f569cb21ee2f1d (patch) | |
tree | ffe4762563274118c310b12194b3d85f1cc490e4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 76f63b7b294b044eef056bc1ceda099e1d5045e2 (diff) | |
parent | 7fb48a776df4dbf97b6c83f085b36aa0e971da24 (diff) |
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev am: e31847642c
am: 7fb48a776d
Change-Id: Ic95cc72ccd03e2bb11b417331a0994f06000c9ac
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions