diff options
| author | Geoff Mendal <mendal@google.com> | 2015-04-28 14:55:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-28 14:55:07 +0000 |
| commit | e339075aa2f9f614419bcbdefbacd3b507ea0551 (patch) | |
| tree | 54d525c9a2ee6c103cf05290c36bd4c87d85529c /tools/aidl/generate_java.cpp | |
| parent | 664660686a410b09e2126408119cd7088cd03911 (diff) | |
| parent | c0aba5f70522088dcaacba59754321f6ce6d61d3 (diff) | |
am c0aba5f7: (-s ours) am 5e43ae9c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'c0aba5f70522088dcaacba59754321f6ce6d61d3':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions