tree c00214625dba134d8015db9a9df58bc901f89c41
parent e5daf6608affeb5be000c1c5dad69772ec247a6e
parent f7e4057f22c5226c0a11b0aec2e30c387ab9f285
author Baligh Uddin <baligh@google.com> 1367466338 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367466338 -0700

am f7e4057f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'f7e4057f22c5226c0a11b0aec2e30c387ab9f285':
  Import translations. DO NOT MERGE