tree 10da860fcff71886af91d082e31f0e1917926848
parent a08fac7947525e47cf0f2947f1a52ecf0690d8df
parent db90cb6081509e13428534170cf714727550fe1a
author Baligh Uddin <baligh@google.com> 1414566063 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566063 +0000

am db90cb60: (-s ours) am 0e27ebef: (-s ours) am dc6f6268: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE

* commit 'db90cb6081509e13428534170cf714727550fe1a':