diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-18 06:27:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-18 06:27:04 +0000 |
| commit | 6f3df0d16b7f88b202ce04c79c061524dd7e6152 (patch) | |
| tree | 380e3896613019929a0de9f72fe782175a1df50c /tools/aidl/generate_java.cpp | |
| parent | 693ad9800b4b87bbe84b399cece9b13de2da64fc (diff) | |
| parent | b06ba83b23b2678e6ba0f7d8553de394a89380b8 (diff) | |
Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 422582d9c4
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions