OSDN Git Service

am 0722071c: (-s ours) am edf2adc8: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 17 Jun 2013 19:12:03 +0000 (12:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Jun 2013 19:12:03 +0000 (12:12 -0700)
* commit '0722071c5d180e42f304aaefdc8e1a4cc505bf42':
  Import translations. DO NOT MERGE


Trivial merge