OSDN Git Service

am 68137588: (-s ours) am 9cde3e1d: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 1 Dec 2014 19:46:31 +0000 (19:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Dec 2014 19:46:31 +0000 (19:46 +0000)
commitfe021d5ee6af15078a5cfdca2c4ad188fa001d70
tree42ebaa44cc26986c5805d2077cf8925e4770451e
parentfceec9cad4a7ef69f1960f2c6a0eae56227e828a
parent68137588d1a1924703a2b995b15293515c4ff418
am 68137588: (-s ours) am 9cde3e1d: (-s ours) Import translations. DO NOT MERGE

* commit '68137588d1a1924703a2b995b15293515c4ff418':
  Import translations. DO NOT MERGE