summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-03-29 18:23:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-29 18:23:47 +0000
commit0fa5e95765090ebf188d5ea975bbe85ebfd375d4 (patch)
tree3c8d156003aae535c157ff6a3e902ce1f67274e5 /tools/aidl/generate_java.cpp
parent3488f863beb995ca611da53374ee42ed09898078 (diff)
parenta614bc99763474ea192a0c0d5f648e788b8f7b01 (diff)
Merge "[automerger skipped] Merge "Move alpha long/short to the base CellIdentity according API Review." am: b57de56276 am: a2a3815e5b -s ours" into pi-dev-plus-aosp
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions