tree 5e897eb2fbf0d8bd8f17efc5b47d1267e95a03ac
parent 63aaec5cc1fd7ab4169e0cd408247ecb0ab46ee1
parent 1c3fb20c5e102346114b244ee3293c7df5d639eb
author Baligh Uddin <baligh@google.com> 1383316835 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383316835 -0700

am 889a3d62: (-s ours) am 64e06b9f: (-s ours) Import translations. DO NOT MERGE

* commit '889a3d6261bd90260dabb27c10fe94684b452d6a':
  Import translations. DO NOT MERGE