tree 9ef722717215b2037f25cb696a1b8c3ef1b6f05d
parent 745c9646d684b035ec5bd455ac20c44e1c1e8897
parent 62516190df7d8c35a73bd1e49da9e22c94cf23e8
author Paul Westbrook <pwestbro@android.com> 1389689020 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389689020 +0000

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

* commit '62516190df7d8c35a73bd1e49da9e22c94cf23e8':
  Fix a crash when General Settings is opened