| commit | 348b03bff44482a3cd004f0aec9b66b721a3b62e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Dec 04 20:24:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 20:24:28 2014 +0000 |
| tree | 21e5bbe7ae78769130a2ea2d6af9b85305f46c3a | |
| parent | a79eea5c9722d1ee23c7b220f4c29815a1c6c0bd [diff] | |
| parent | 2dadff70d46dd13ba2e51e8ecd5601c6f2f602d3 [diff] |
am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '2dadff70d46dd13ba2e51e8ecd5601c6f2f602d3': Import translations. DO NOT MERGE