diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-27 20:09:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 20:09:43 +0000 |
| commit | 97026b4c06b5cfea040455536e032646e88e37f7 (patch) | |
| tree | acd3e38539512eb037d74a6af7719b655d80b613 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 17b6e57c234b2a8b8cc5f92e6820bf457eb1ffc4 (diff) | |
| parent | cdfac851ff301dd592dfc4ab2f5be7fbc9a34717 (diff) | |
am cdfac851: am 0171f382: (-s ours) am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev
* commit 'cdfac851ff301dd592dfc4ab2f5be7fbc9a34717':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions