tree d94a071c69525e675e17f6e2be340d928ba5b012
parent 5cd1d120196fd26a8110e4bc746a2df7a898c5de
parent 065972cdcf7bc74055fd2c79e4d756186369bc61
author Baligh Uddin <baligh@google.com> 1443284497 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443284497 +0000

am 065972cd: (-s ours) am eb6fabd1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '065972cdcf7bc74055fd2c79e4d756186369bc61':
  Import translations. DO NOT MERGE