tree 81da87041939d507b4ba0015cf033d7c8c9ed6bc
parent 9dbf87543b3a08fe39ba160494207f074294134c
parent 83774965fefc5d0315ec41641bdd99cf0a657462
author Marco Nelissen <marcone@google.com> 1379372661 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379372661 -0700

am 83774965: am bc910e5c: Merge "Fix hang" into klp-dev

* commit '83774965fefc5d0315ec41641bdd99cf0a657462':
  Fix hang