OSDN Git Service

am aaaeabd6: Reconcile with jb-release nakasi-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 21 May 2012 21:28:52 +0000 (14:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 May 2012 21:28:52 +0000 (14:28 -0700)
commitfbde5266d7d16fcb309305b431c53ff66c363b26
tree4ee4c0790bde55072f56d4a59afa5e029444f84c
parent1aa3d1e04ab0f12af1e38b3ec143cfc8e2c19cb3
parentaaaeabd6a655068605747ad492ddb0ee128d1c36
am aaaeabd6: Reconcile with jb-release nakasi-factoryrom-release

* commit 'aaaeabd6a655068605747ad492ddb0ee128d1c36':
  Fix a NPE found by Moneky.
  Fix a dead lock while we freeze the screen.
  Restore deleted  string still referenced from menu resource.