tree cba62d0d64153aa2169651696bc238591341d679
parent 8695789a3ff6bbcdae0b6c08805d5b29c6fe50bc
parent 0e27ebef5b54b6ac2e57c29da5791e6539535e98
author Baligh Uddin <baligh@google.com> 1414085109 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085109 +0000

am 0e27ebef: (-s ours) am dc6f6268: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE

* commit '0e27ebef5b54b6ac2e57c29da5791e6539535e98':