OSDN Git Service

am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 5 Dec 2013 19:21:26 +0000 (19:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 19:21:26 +0000 (19:21 +0000)
commite9529fe6cd7e0c8d3d6faad1b6db9c0d105ea702
treeb16abb32163358771fd4f484babd9bc1068471a6
parentd82e8f2bec1421c660c786f89e75ffcc4a6fd11e
parentdfa4596778b39d07aa7f27145baedee31d17cd48
am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit 'dfa4596778b39d07aa7f27145baedee31d17cd48':