commit | 1c0967262981f070a2e22c817d97123513864a7d | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Dec 15 19:02:09 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 19:02:09 2014 +0000 |
tree | 968abe5dff94f59043451c62df61c8e6c9d10ad3 | |
parent | f693ff9efa2ea0a3ec390fa390090a895b971b8c [diff] | |
parent | 755005bddf4e476dda9404d0ab3ee007b7ebd554 [diff] |
am 755005bd: (-s ours) am d9df577d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '755005bddf4e476dda9404d0ab3ee007b7ebd554': Import translations. DO NOT MERGE