tree b7fcb8e2fee04ccfa600985e4bbc45a1f29c14ae
parent ac132888d0d6362149fffcfda1a8b8aaf4ac0c1f
parent 9dcfcc845d5fdbedbbb41e0d22dd3e16a6a53fe5
author Christopher Tate <ctate@google.com> 1383160951 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383160951 -0700

am 9dcfcc84: am 19427156: Merge "Don\'t crash when preferred activity settings are malformed" into klp-dev

* commit '9dcfcc845d5fdbedbbb41e0d22dd3e16a6a53fe5':
  Don't crash when preferred activity settings are malformed