tree ee55a75ad8dd61305a4b705196ac5cdb2ca84920
parent f6c080c48b49b29dadf19feae57792eb579c92be
parent e2ded655400f1151a613ea13b21015d4e4d16ea2
author Baligh Uddin <baligh@google.com> 1383695386 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383695386 -0800

am e2ded655: (-s ours) am 1ec0f22d: (-s ours) Import translations. DO NOT MERGE

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