OSDN Git Service

am beb3d8b1: Merge "Fix Settings NPE" into jb-dev
authorBrian Muramatsu <btmura@google.com>
Thu, 28 Jun 2012 23:56:29 +0000 (16:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 Jun 2012 23:56:29 +0000 (16:56 -0700)
* commit 'beb3d8b1e06f26c20adc4d4db7a08ac507ad6ab0':
  Fix Settings NPE


Trivial merge