diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-20 02:26:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 02:26:28 +0000 |
| commit | 8755f9ebb820007d8e568f2e664519ac8e4bc7d7 (patch) | |
| tree | 43f9d26b852f8ec9eb2b24aa6f6d428daff38db2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 39c4962580a52d5ca07f3576009564dddc8f4624 (diff) | |
| parent | 60931a784ff5c7659a432ed7b4f5ea5a22156637 (diff) | |
am 60931a78: am dc4442f1: am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev
* commit '60931a784ff5c7659a432ed7b4f5ea5a22156637':
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