diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-11 15:54:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-11 15:54:48 +0000 |
commit | 3bced6c53674175a3fb9a24e197fcffd466412cc (patch) | |
tree | 6a1ab462d3999f3de1a095bbf9d2b572e4df1357 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 103d2b3787129adfdb1c60fe4ce2ba159fcdb4c5 (diff) | |
parent | c421452ce824fbf7f7f200db5985f965141f413e (diff) |
[automerger skipped] Merge "Add EBS interface to BatteryController" into rvc-qpr-dev am: 05afc4f43b am: c421452ce8 -s ours
am skip reason: Change-Id Ie450194ee34b319cff926a49aca99544dcca0e9c with SHA-1 c553798e85 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12333942
Change-Id: Ie637d3669ccc3a3e65a469b64985bc1c5f7b9019
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions