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