tree 02c6360c60b340833ad2316946ed988949f8a4d6
parent e2823cb3dbe15d1c3dbd6253f28982765a7451d5
parent 20a5d3317529ce573aa06ac2e4a0a1a5359f80d7
author Selim Cinek <cinek@google.com> 1438293275 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438293275 +0000

am 20a5d331: Merge "Fixed a heads up crash" into mnc-dev

* commit '20a5d3317529ce573aa06ac2e4a0a1a5359f80d7':
  Fixed a heads up crash