tree 9ef722717215b2037f25cb696a1b8c3ef1b6f05d
parent 5498bd2b257664d4cecc4706e6de149e013454b0
parent 3a229e6f71ffe1004304ad1a9fba17621106b0ab
author Paul Westbrook <pwestbro@android.com> 1389688690 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389688690 -0800

am 3a229e6f: Merge "Fix a crash when General Settings is opened"

* commit '3a229e6f71ffe1004304ad1a9fba17621106b0ab':
  Fix a crash when General Settings is opened