| commit | b8fcb473e499ed160ee24cccdba73002a73977e3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 20:24:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 20:24:52 2014 +0000 |
| tree | 5fa15b78d8bd152a6d917bb8daa9a3504b1f98d3 | |
| parent | 5e883b3b37e7203f712174ed46b7a04eb19ea3da [diff] | |
| parent | a37526a6829c24abfac6fc21b41225f7ee11e756 [diff] |
am a37526a6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'a37526a6829c24abfac6fc21b41225f7ee11e756': Import translations. DO NOT MERGE