OSDN Git Service

am 06efcdc6: (-s ours) am e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 19 Oct 2015 16:11:50 +0000 (16:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 16:11:50 +0000 (16:11 +0000)
commit0d662630dca28ade708669cdf1bc61e353ed56bf
treee579f8dcea468848b4e2828a526acbc7bbffdc15
parent9a6c8b84855bc3d2dddc580c3b2ae0c85c45ffd5
parent06efcdc6bed934ac3c138a380728f6b11e051f28
am 06efcdc6: (-s ours) am e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559  -s ours

* commit '06efcdc6bed934ac3c138a380728f6b11e051f28':
  Import translations. DO NOT MERGE