OSDN Git Service

am 0ec53f47: (-s ours) am 33ce277a: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 1 Nov 2013 15:34:20 +0000 (08:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 Nov 2013 15:34:20 +0000 (08:34 -0700)
commitaa61fd71e169d64cfd243af49694b6fdb0a8e28d
treea85077c89413f9b1d8d6a0b427b0aa388bc83581
parent6ce03f474834cf30d9697dbaf574c07ec13a8ad6
parent0ec53f479bfd40a56bf20924cb9debf4cea829db
am 0ec53f47: (-s ours) am 33ce277a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '0ec53f479bfd40a56bf20924cb9debf4cea829db':
  Import translations. DO NOT MERGE