diff options
author | Joe LaPenna <jlapenna@google.com> | 2015-11-12 23:21:09 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-12 23:21:09 +0000 |
commit | ddf77e14e5d6a5b8aa61c0a9f82c099468129df7 (patch) | |
tree | f7642c577566ed7c95553465aa5adbdafbfa3a03 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e0c9dd1b4fbeb2667a58686ab8a71e5cfd070e49 (diff) | |
parent | 2d43dd3c0e49776589cb21bfbf9b3860623d0bfc (diff) |
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev am: 6915d809e8 -s ours
am: 2d43dd3c0e -s ours
* commit '2d43dd3c0e49776589cb21bfbf9b3860623d0bfc':
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