| commit | ea964156460bbe8ab8f03c8de5f9f529234d69ce | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 15 15:17:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 15:17:39 2014 +0000 |
| tree | 4182d6fb811b8ce0c589c32b66d97c946b8ea617 | |
| parent | 0736ee2631372a930f9b3c2919ef3b893ce8918a [diff] | |
| parent | b73e02cf5c736a944155b9d4586d8e8a6e40dc6e [diff] |
am b73e02cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'b73e02cf5c736a944155b9d4586d8e8a6e40dc6e': Import translations. DO NOT MERGE