OSDN Git Service

am e6405a05: (-s ours) am 1dbf0ed9: am 6d9d8e3d: Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:57:54 +0000 (15:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:57:54 +0000 (15:57 -0800)
commit97ea4fd5a5102c46bf63a9e4f93628d4406703d7
treef5fd1d68ca06b6b610d85cb0084adf5d0c4f9822
parentcb85b7fa10f9a73d6f869eec13dd8f21b5552b56
parente6405a0591de86807da2d6b3140abc67f839a773
am e6405a05: (-s ours) am 1dbf0ed9: am 6d9d8e3d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

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