diff options
| author | Jim Miller <jaggies@google.com> | 2016-06-09 00:34:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-09 00:34:25 +0000 |
| commit | 1810a6811760a97e09ae53d5954fe47a00102eee (patch) | |
| tree | 75cbb2f528e433518852a83b7657f1722a8a4480 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 74d48d86a9eb52e6529b465fa84897e7cccd9de3 (diff) | |
| parent | e36da9c8c9f8f50a47dd985f795dbb2b24cbef54 (diff) | |
Merge \"Revert \"Temporarily increase timeout for devices with buggy driver\"\" into nyc-dev
am: e36da9c8c9
Change-Id: I442bcdfc4664d41638ae95ef0bd0098f4111c301
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions