OSDN Git Service

am 9b4d5a42: (-s ours) am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Thu, 23 Oct 2014 17:32:32 +0000 (17:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 17:32:32 +0000 (17:32 +0000)
commitfc6dab311751300cde3031626d3dbacfd15614fc
treecba62d0d64153aa2169651696bc238591341d679
parent784bbb1793821349bf77c3e4764967f822b54bdd
parent9b4d5a425be9f641076f32da863b04e009de1922
am 9b4d5a42: (-s ours) am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '9b4d5a425be9f641076f32da863b04e009de1922':