diff options
| author | John Reck <jreck@google.com> | 2019-09-26 09:42:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-26 09:42:26 -0700 |
| commit | 15c1ce9780553b71e1ec8817e9abc73bd16fd64c (patch) | |
| tree | 24a57e30ec85e93e59aef3063cddaa4e5fb29f76 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e7f1398ac067aa4b26ccfb920f3492dc602e1bef (diff) | |
| parent | 457832bf87e2f5ff7948c703f08c840e95940475 (diff) | |
[automerger skipped] Merge "Increase dequeueBuffer timeout" am: 6e1e6fd699 -s ours am: 9b02158c76 -s ours am: fc997d2d3a -s ours
am: 457832bf87 -s ours
am skip reason: change_id Ic4fae04b41f71600479f9557e334f67c27851db4 with SHA1 3f333d6d72 is in history
Change-Id: Id2a200da0049fba88a5ce3c8c6ed5383617cd4c6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions