tree ba7baa1cbc2a4ab93b7523a90df9c8b132aab577
parent 6c424e2fb159a52818504410a8c5229e595f12e4
parent 1b02178d16da6817d509e70107a9e0364f058236
author Brad Fitzpatrick <bradfitz@android.com> 1276306137 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276306137 -0700

am 94f14aec: Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread

Merge commit '94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2' into gingerbread-plus-aosp

* commit '94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2':
  More StrictMode work, handling violations in ActivityManagerService.