commit | 6daffe5c15a062b824a748b1658761b802282cad | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Tue Oct 14 01:29:35 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 01:29:35 2014 +0000 |
tree | c1000dd83e63e2abf77c45854e58bda1a66adcd4 | |
parent | 48caf4b3bf304513cd094115924a8a49e39c72b0 [diff] | |
parent | b251163868bd8808817d8989df89d5182c65a9dd [diff] |
am 63b599dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '63b599ddd6b97e7d6a825c81321e835e8e3a0b20': Import translations. DO NOT MERGE