diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-20 02:33:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 02:33:35 +0000 |
| commit | afa9b6fd39fc4976eeb3684458a6ecf41ec7373a (patch) | |
| tree | 3f869b10b3e8ab6d05a461bb0c0c99e9f11bd899 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3b1c32eb5d96c9a13e101cc7207f27d045c6bd8b (diff) | |
| parent | 8755f9ebb820007d8e568f2e664519ac8e4bc7d7 (diff) | |
am 8755f9eb: am 60931a78: am dc4442f1: am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev
* commit '8755f9ebb820007d8e568f2e664519ac8e4bc7d7':
Fix issue #23361510: Increase assist timeout from 500ms to 1 second
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions