diff options
author | Johan TorĂ¥s Halseth <johanth@google.com> | 2017-05-03 14:02:11 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-03 14:02:11 +0000 |
commit | bdc3dd8d5de84e9b6f23050de747765f1324ddf7 (patch) | |
tree | 891e30615679251efb24248af17265c876b6008d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 825b5748925f30d936b691f335ae3d8133483f31 (diff) | |
parent | 3eafb6e2c6e6239386af496e1e90a4435f0965df (diff) |
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
am: 3eafb6e2c6
Change-Id: I33cac59253e106423680c70d5f79d83402109afd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions