OSDN Git Service

am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."
authorCraig Mautner <cmautner@google.com>
Mon, 7 Apr 2014 22:21:33 +0000 (22:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Apr 2014 22:21:33 +0000 (22:21 +0000)
commit8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a
tree153ee3ce06efcfb1f1e75cfa04d1016b39bd92cc
parentec571bd203bb543aa1489e0c0a8bb67f5491630e
parent228cefa83dd7b95e5581f619bb597808af726f80
am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."

* commit '228cefa83dd7b95e5581f619bb597808af726f80':
  [ActivityManager] Reduce report ANR on wrong activity.
services/core/java/com/android/server/am/ActivityRecord.java