OSDN Git Service

am 8dda89ca: (-s ours) am bad1356b: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Sat, 4 Apr 2015 05:55:38 +0000 (05:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 4 Apr 2015 05:55:38 +0000 (05:55 +0000)
commit4c3689a25334d9d5502778738209cdfc5e26e08e
treebcd9a1826952e04932dabaddc8101b6909f8e14e
parent06bcd0c72b7f8af9033942fe147d76aa89e83b49
parent8dda89cae7a7ff846ba03cbf6cb0d3434b473c4b
am 8dda89ca: (-s ours) am bad1356b: (-s ours) Import translations. DO NOT MERGE

* commit '8dda89cae7a7ff846ba03cbf6cb0d3434b473c4b':
  Import translations. DO NOT MERGE