diff options
author | Ajay Panicker <apanicke@google.com> | 2017-07-25 02:19:31 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-25 02:19:31 +0000 |
commit | 4c0900102b39c2e49afbeca0f7c87973e7b1a720 (patch) | |
tree | b9102079899766a3d34c6f18d7a43543b475e712 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 6a5d9108df6d01f519bc9502c54cdd389d1ac5e0 (diff) | |
parent | aaf3860941f8a7eb631c50755a04b5a8aed003ac (diff) |
Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev
am: aaf3860941
Change-Id: I627a6da4db6eb09b68e23882ccef2de4c80bf747
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions