OSDN Git Service

am caf70588: am ebe62dc6: (-s ours) Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:55:18 +0000 (15:55 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:55:18 +0000 (15:55 -0800)
commit119173c74b61bd90203060a81468499c3a89bd54
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent99190c78fa45ad42de2d0d2604bda94ab09565eb
parentcaf70588f7a97aaad805b008f91c750fe59b45b5
am caf70588: am ebe62dc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'caf70588f7a97aaad805b008f91c750fe59b45b5':
  Import translations. DO NOT MERGE