tree 5a02e8cf5240b5589754cd11ec8ef1e7c012d87c
parent 261db4f3a8709a0773d0932dd1052f526e59da3c
parent 6774911ee2954eebf2b2003e97b949be6bdbd836
author Baligh Uddin <baligh@google.com> 1417558793 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417558793 +0000

am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '6774911ee2954eebf2b2003e97b949be6bdbd836':
  Import translations. DO NOT MERGE