OSDN Git Service

am 350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscre...
authorBaligh Uddin <baligh@google.com>
Mon, 29 Oct 2012 20:39:21 +0000 (13:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Oct 2012 20:39:21 +0000 (13:39 -0700)
commitaee2ef0a848d8008eda92a0f1fbdcb65af0490ce
tree5ed2d5dbae30aa82d84acacdef3a6f8321d6e048
parentbb15cfbd112e729372e8b1a424d56cbdb34d5db5
parent350ea07ca8e650bf167491deefdb421a183bbedd
am 350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '350ea07ca8e650bf167491deefdb421a183bbedd':
  Import translations. DO NOT MERGE