summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJoe LaPenna <jlapenna@google.com>2015-11-12 23:13:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-12 23:13:01 +0000
commit2d43dd3c0e49776589cb21bfbf9b3860623d0bfc (patch)
tree7112178d0f0dd57f1e91cf4f45504fc6faf0305b /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd30c141a2dee881fd83e1415a50161def1acf227 (diff)
parent6915d809e895d29411c0a687bff7fdd391509dc7 (diff)
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev
am: 6915d809e8 -s ours * commit '6915d809e895d29411c0a687bff7fdd391509dc7': DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions