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