tree 14c1695353f980f7d58ad3028f5e2f5687b09dcd
parent 762cf3c9a22b345711cc3119372225c9c80a8419
parent e69f6af314c936c17eb5b100c63ea219f72fdd1e
author Baligh Uddin <baligh@google.com> 1411489063 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411489063 +0000

am 5eeff99e: (-s ours) am 011a2f23: (-s ours) am 961c338d: (-s ours) am 4117cf1c: (-s ours) am fc3eea68: (-s ours) Import translations. DO NOT MERGE

* commit '5eeff99ec99576dc009a9f93907c874c5cd67060':
  Import translations. DO NOT MERGE