diff options
| author | Jim Miller <jaggies@google.com> | 2016-06-09 00:45:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-09 00:45:49 +0000 |
| commit | 103d18e6a3fe4f3bc2c88e8dfa0ed1164f58325f (patch) | |
| tree | def022decc5e60165c85c6bb282feb444c9d3959 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 54b8dd8f2193e02d238ce6d795e5e8264795226e (diff) | |
| parent | a72d7d3c831c71d8cad1c31aa613023ef7e8dd2a (diff) | |
Merge \\\"Revert \\\"Temporarily increase timeout for devices with buggy driver\\\"\\\" into nyc-dev am: e36da9c8c9 am: 0354b47b28
am: a72d7d3c83
Change-Id: I6efaff87fef4acfedbd5c4601992130b153e4320
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions