OSDN Git Service

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop
authorBaligh Uddin <baligh@google.com>
Sat, 18 Oct 2014 16:05:41 +0000 (16:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 18 Oct 2014 16:05:41 +0000 (16:05 +0000)
* commit '68207e2532b2059e513a1c4e33c3c52e1ac1e559':
  Import translations. DO NOT MERGE


Trivial merge