OSDN Git Service

am 7cbf5af8: (-s ours) am e1f9ccbe: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 7 Jan 2014 05:13:55 +0000 (21:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jan 2014 05:13:55 +0000 (21:13 -0800)
* commit '7cbf5af891b178523f5091baae4bfa5153cafa3e':
  Import translations. DO NOT MERGE


Trivial merge