diff options
| author | Annie Meng <anniemeng@google.com> | 2018-03-16 10:37:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-16 10:37:19 +0000 |
| commit | dc671e166d2f0615dee65c4eda09108e7149c8f5 (patch) | |
| tree | 9ef08e0506dcbe9ecdf7fc6ba6751571d6d7d5ad /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5563e8f5de13ea09aaddb1ac11a75da1889782af (diff) | |
| parent | ec243338ea4c53bd24aaece7382ede4a8c85faeb (diff) | |
Merge "DO NOT MERGE Create a setting for backup/restore agent timeouts" into pi-dev
am: ec243338ea
Change-Id: I229ad0b8545f7aa2d4cfabf72cf39b90ec6e000d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions