tree f03503c967b8db75837f9840c6d72416dcb09cc8
parent 8f77316183e2009e4d9d100abc5733f1a536e68a
parent 4569166a59e9c63b5a8272dc312f362c9d1f0916
author Baligh Uddin <baligh@google.com> 1386283502 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386283502 +0000

am 4569166a: (-s ours) am 313e9173: (-s ours) am 979c8a8f: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '4569166a59e9c63b5a8272dc312f362c9d1f0916':