| commit | ff41a846a47d3de8843c9150c237a387bd5b1ed7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 28 15:39:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 15:39:55 2015 +0000 |
| tree | 63ae8f80f0d7c1eb8fd4d546f4b2ef778ae575c5 | |
| parent | 89b056c10f3baf56696b0e3686e6a6d34e374fb2 [diff] | |
| parent | 34f67e45319f398fb27e05d56918f951e6d44607 [diff] |
am 34f67e45: (-s ours) am fcfec915: (-s ours) Import translations. DO NOT MERGE * commit '34f67e45319f398fb27e05d56918f951e6d44607': Import translations. DO NOT MERGE