commit | 588f889c2569502bffece8778880bda73bc9c270 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Nov 26 18:44:04 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:44:04 2014 +0000 |
tree | 0704082f6023aa4a254e32609792141d1b887433 | |
parent | 019b222d8e5a68c413fc040e7e7049f27a66f60a [diff] | |
parent | dd59e45031cd8c7b732c72ddb804238605289ef9 [diff] |
am 4cd6aff7: (-s ours) am 0eaaa2d8: (-s ours) Import translations. DO NOT MERGE * commit '4cd6aff7eb53ffa84c07349211cd78815b849b56': Import translations. DO NOT MERGE