OSDN Git Service

am e3a25165: (-s ours) am 9e63f233: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 17:10:35 +0000 (17:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:10:35 +0000 (17:10 +0000)
commit5ac716cc686d4cfa230a155218f51344434c9a41
treebb5c3abaa2dc3ad48c8c8fe5b5814063b5b82f26
parentf63a742af1c81dfe44579b7e7b5fd7f90ad7e612
parente3a25165a4dae32a4081d7fa886607269719cfb4
am e3a25165: (-s ours) am 9e63f233: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'e3a25165a4dae32a4081d7fa886607269719cfb4':
  Import translations. DO NOT MERGE