tree b3fd63f272daa46dbea008b72c29a940bcb86c8e
parent ee01bb11229ebe922edea7aee34c694e69df344b
parent ff82cc6dfc91b128e965e2a998294e2c6b575f33
author Baligh Uddin <baligh@google.com> 1412095921 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412095921 +0000

am ff82cc6d: (-s ours) am 8d1a60d4: (-s ours) am 0b470dd9: (-s ours) am 8ddabcd0: (-s ours) am 0b1acbb5: (-s ours) Import translations. DO NOT MERGE

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