OSDN Git Service

am 2ef3999a: am b2993d29: (-s ours) Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:47:29 +0000 (15:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:47:29 +0000 (15:47 -0800)
commit3ccd8f1c3b507aafacf7d7dde2c54ffc0c9ed519
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent23ce59522c304e7c837efe2dac725fcda7a97079
parent2ef3999af3edcc146b9c5255c7474f3dbc4d998f
am 2ef3999a: am b2993d29: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '2ef3999af3edcc146b9c5255c7474f3dbc4d998f':
  Import translations. DO NOT MERGE