OSDN Git Service

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


Trivial merge