OSDN Git Service

am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 14 Feb 2014 20:54:44 +0000 (20:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 20:54:44 +0000 (20:54 +0000)
commit9b4d5a425be9f641076f32da863b04e009de1922
tree2847949f8bc9111a84704c12bd64ebc1ee2ced97
parent76fffaeaa2963b9cd777f49ce297ef1d0760cd15
parent65301b1443804099de1e5165d98a0506682df5cb
am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '65301b1443804099de1e5165d98a0506682df5cb':
  Import translations. DO NOT MERGE