tree dd98273002265d51bcc536cadc62fe25baf32cfb
parent 64a16d99dff0cab3744164b76327c42190e3a5b6
parent a9222de2fc6f52fb4657a91d6f12723b05cb948d
author Jim Miller <jaggies@google.com> 1295919329 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295919329 -0800

am a9222de2: am 935dedf6: Merge "Fix 3385152: Update lockscreen font." into honeycomb

* commit 'a9222de2fc6f52fb4657a91d6f12723b05cb948d':
  Fix 3385152: Update lockscreen font.