OSDN Git Service

am 21df8221: (-s ours) am 69b87f79: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 19 Jan 2015 15:20:48 +0000 (15:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Jan 2015 15:20:48 +0000 (15:20 +0000)
commit8c302e34220ae13eacbd997eb955f55c545601e6
tree9f29705e17ac3a65a50f3205dca07e3a9422f39e
parentb1789780f7453822d195567f011ea926d9c67492
parent21df822137b4750d1be2ccf7895876758255c8d0
am 21df8221: (-s ours) am 69b87f79: (-s ours) Import translations. DO NOT MERGE

* commit '21df822137b4750d1be2ccf7895876758255c8d0':
  Import translations. DO NOT MERGE