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