tree b0a2c6b98743f856b76a91f5ca2cf3ea1bd08ca6
parent 3b68ca168acc09b54fa3f6ed73e7ded10e5b8105
parent 35c68de93dfec0a237642cca56ade0ba3a6aff92
author Dianne Hackborn <hackbod@google.com> 1438651852 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438651852 +0000

am 35c68de9: am 5dd9ef04: am b0bc8368: am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev

* commit '35c68de93dfec0a237642cca56ade0ba3a6aff92':
  Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up