tree 4ac6ea4f9cdc30c08c5a6f81f3301220667e5679
parent 4c49b1fb774d59d3a6e8a6bb5a4549828504c5af
parent af6eaf656ec0de5fcbea03968daffe2c845e2089
author John Reck <jreck@google.com> 1423087707 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423087707 +0000

am af6eaf65: Merge "Fix ANR caused by hwuiTask thread" automerge: 5ad36d4

* commit 'af6eaf656ec0de5fcbea03968daffe2c845e2089':
  Fix ANR caused by hwuiTask thread