summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-05-08 08:21:33 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-08 08:21:33 -0700
commitb4b616db1e27215192022c7de75bc565d8e4dea7 (patch)
tree2970fdcea5975bea3bbf40b3fa092ab2e127087d /tools/aidl/generate_java.cpp
parent43d83d913ed0f6d67308140935a64d54c9f36e02 (diff)
parentccb89f926375a377643075b376d157608ecfb468 (diff)
[automerger skipped] Merge "Adding batterystats history to proto dump." into pi-dev am: 291b944d89
am: ccb89f9263 -s ours Change-Id: I7981e34b4029b46233f7a47d3ad3f1c7f56a61a5
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions