tree 89b92b0acea0cbd0a97c7410dc592c655a05f8a4
parent e9abc279fd0e1cd3a7c0bfb878c9b5ae22840b9b
parent 8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a
author Craig Mautner <cmautner@google.com> 1396909675 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396909675 +0000

am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."

* commit '8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a':
  [ActivityManager] Reduce report ANR on wrong activity.