OSDN Git Service

am e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 19 Oct 2015 16:08:22 +0000 (16:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 16:08:22 +0000 (16:08 +0000)
commit06efcdc6bed934ac3c138a380728f6b11e051f28
treee21a1bfabd92e2b3198339731697b990fd0cbaf7
parent69988b3cee1df8fd1fee9ae2041a0981cc491bd2
parente0f00d04d4d68348a8baf03f3c51521389aff576
am e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559  -s ours

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