OSDN Git Service

am 06e7810c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscre...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:56:59 +0000 (15:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:56:59 +0000 (15:56 -0800)
* commit '06e7810cb3467ef99623826d662d18cc5ae64330':
  Import translations. DO NOT MERGE


Trivial merge