OSDN Git Service

am 5468ae41: (-s ours) Merge "Import translations. DO NOT MERGE"
authorBaligh Uddin <baligh@google.com>
Thu, 13 Mar 2014 16:24:37 +0000 (09:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 16:24:37 +0000 (09:24 -0700)
commit1f172594aac13e1523135b0dab555f9e0ffe7276
tree837922e473cb336a953fa58393103fe54dd48d35
parentfc4457faf8acc8adc3da96f3053330f74196dbec
parent5468ae4125d8583982717ab7278207cb79dff9c6
am 5468ae41: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '5468ae4125d8583982717ab7278207cb79dff9c6':
  Import translations. DO NOT MERGE