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