OSDN Git Service

am 91e2b2d2: (-s ours) am 77c67943: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Oct 2014 20:36:52 +0000 (20:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Oct 2014 20:36:52 +0000 (20:36 +0000)
commit32de3fa8c60a8b776b0f5a6352ba8a7bad4a0050
tree641b5f29568d00f20d12987b1a43349bb62db54a
parent81db2fe78a02c3f01afde9e05f5594c3f2ebb80b
parent91e2b2d232d7e106b5f688e4ce95d79f768ecf63
am 91e2b2d2: (-s ours) am 77c67943: (-s ours) Import translations. DO NOT MERGE

* commit '91e2b2d232d7e106b5f688e4ce95d79f768ecf63':
  Import translations. DO NOT MERGE