diff options
| author | Johan Torås Halseth <johanth@google.com> | 2017-05-03 14:07:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-03 14:07:47 +0000 |
| commit | 5b28415300199d2c10ef29785248702722e9ac25 (patch) | |
| tree | bdc518c5cff2d5450269414d6c07526b7ad5017c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 673c07f3da0a7e5f21bd50549c1a3ccbea7deff0 (diff) | |
| parent | bdc3dd8d5de84e9b6f23050de747765f1324ddf7 (diff) | |
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev am: 3eafb6e2c6
am: bdc3dd8d5d -s ours
Change-Id: I9895d98e8f1565b2bda044c405b83ae9d5c49e54
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions