diff options
author | Ajay Panicker <apanicke@google.com> | 2017-05-09 21:02:10 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-09 21:02:10 +0000 |
commit | 72e1155b1b5948e0ed4f67bcd2a93fd5f590ff76 (patch) | |
tree | bd4b24a0849268ea963159b1c28d69a5f007802c /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 4b02b5ac4538ad74190640b53ef0d9500356487f (diff) | |
parent | e53d5bd05b6532e731eecd49a0dbe4422de2efa2 (diff) |
Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am: 7df4093371 am: a3fe28806e am: 79b8b354c8 -s ours" into oc-dev-plus-aosp
am: e53d5bd05b
Change-Id: I612e67e6bc95e28ea79a397c9ef0d407e84bbc27
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions