OSDN Git Service

am 98b7584e: am 2a857c63: Merge "Work on issue #17624121: Settings crash while launch...
authorDianne Hackborn <hackbod@google.com>
Wed, 24 Sep 2014 22:27:41 +0000 (22:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Sep 2014 22:27:41 +0000 (22:27 +0000)
* commit '98b7584e1c45b9963a59de1625594c704065c575':
  Work on issue #17624121: Settings crash while launching on wiped device


Trivial merge