OSDN Git Service

am ad4de2fa: (-s ours) am c5d18345: (-s ours) am cdf00b16: (-s ours) am 1538dde4...
authorBaligh Uddin <baligh@google.com>
Fri, 11 Sep 2015 16:50:21 +0000 (16:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Sep 2015 16:50:21 +0000 (16:50 +0000)
* commit 'ad4de2fa60a490bf922051c515cf8ac0a133a8cf':
  Import translations. DO NOT MERGE


Trivial merge