OSDN Git Service

am 921a3144: (-s ours) am dcd15ee0: (-s ours) am 7256942b: (-s ours) am d01ca3ce...
authorBaligh Uddin <baligh@google.com>
Thu, 5 Dec 2013 19:21:36 +0000 (19:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 19:21:36 +0000 (19:21 +0000)
commit8be6770c4edb11ea3784a193d37339251b06902b
treeb16abb32163358771fd4f484babd9bc1068471a6
parentc3835eae2336e3d42e28f0a8c712238e4fe12701
parent921a3144a06496acfb06b512e443473141056304
am 921a3144: (-s ours) am dcd15ee0: (-s ours) am 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

* commit '921a3144a06496acfb06b512e443473141056304':