tree d56dc3b1291c0fcad81a9ccfb84bedef5fbaecc8
parent 89ff0847a58191e3b276ff7080e989615d76d831
parent 5b301f34df7f9619226b418b5a3d625a1f9210eb
author Baligh Uddin <baligh@google.com> 1405621763 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405621763 +0000

am 5b301f34: (-s ours) am a9ba885a: (-s ours) am 25df0740: (-s ours) Import translations. DO NOT MERGE

* commit '5b301f34df7f9619226b418b5a3d625a1f9210eb':