summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-08-05 03:01:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-05 03:01:13 +0000
commit8534274ef01a1c5cbe05472112d1dec15ccbaabd (patch)
tree274d8acccb8dd9bab9db31ec95890b933a6ec1d4 /tools/aidl/generate_java.cpp
parenta10355b746b8604de5bb8f05b4f3a885b0f16158 (diff)
parent1cca69afc79077affb3bb966ab8f3db0c44b1248 (diff)
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: bce71a114d -s ours am: 9c8e58c1ad -s ours" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions