tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent dd99f5636cd8cb2dbf711b09686e5a47c2049a50
parent 85a5eb02c8de728631036dad3b1b19be0dccd9fe
author Baligh Uddin <baligh@google.com> 1426893143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893143 +0000

am 85a5eb02: (-s ours) am c428e3b2: (-s ours) am 1ed2a9d6: (-s ours) Import translations. DO NOT MERGE

* commit '85a5eb02c8de728631036dad3b1b19be0dccd9fe':