OSDN Git Service

am 26ceafbf: (-s ours) am bb7eeade: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 29 Sep 2015 15:03:47 +0000 (15:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Sep 2015 15:03:47 +0000 (15:03 +0000)
commit6a796dbb94f04e0102eeb3fac212a9f531c29e20
treeaab8918d7cbb15a000889d189d9a3338c92f4762
parent6c7f7e26883a95038f15324de75c338a37223122
parent26ceafbfe0f0cf02a4c1a10b1661105cdc774486
am 26ceafbf: (-s ours) am bb7eeade: (-s ours) Import translations. DO NOT MERGE

* commit '26ceafbfe0f0cf02a4c1a10b1661105cdc774486':
  Import translations. DO NOT MERGE