summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMichael Runge <mrunge@google.com>2014-12-18 01:49:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-18 01:49:08 +0000
commit37fed329adec7b339755fde0b38c687f70524e4e (patch)
treecae06999d3a230485086c31b02050c97e1623f37 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6dfc3aab025579d0472d99fc80a1a6af0703240b (diff)
parent01c06dfb076b71cb72c4bff9175bec9d59d2efde (diff)
Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions