diff options
| author | Artem Iglikov <artikz@google.com> | 2018-03-22 14:31:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-22 14:31:42 +0000 |
| commit | dabd919fb652d279ebf6d4adeb33a770e4527dcf (patch) | |
| tree | 4791506a8ef275e92e6389a86af7b813bfc76b23 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6909539a2d4a1418d482002170184dc435fa7b64 (diff) | |
| parent | 2d05d85da1fc611259a2d69c6aee3fb57896d692 (diff) | |
[automerger skipped]Merge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"" into pi-dev am: 3e4df18658
am: 2d05d85da1 -s ours
Change-Id: Ie648f1b6b112d1dcf447024a4eeea0fb49440338
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions