tree d2dee972cbda6f391d6f06e97cc805f26a8bfde4
parent 0cb0a37f1c8463fa3ba535dc4969316f7c1cbf88
parent 9d2b0dbf67844ead1a0aeb22e1e3097d2ec60171
author John Reck <jreck@android.com> 1372199656 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372199656 -0700

am 9d2b0dbf: am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread"

* commit '9d2b0dbf67844ead1a0aeb22e1e3097d2ec60171':
  Fix deadlock of WebViewCoreThread