tree d397413d2aa3b66d8123afa4a712f74ff46d0df8
parent 7b388f9035d898840ab54f4942563dcfeccdcfa5
parent 3fa1d013a297605db9c8e2a4ef71f5bf9c888a24
author Marco Nelissen <marcone@google.com> 1380143775 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380143775 -0700

am 3fa1d013: am d7b5f3da: Merge "Fix hang" into klp-dev

* commit '3fa1d013a297605db9c8e2a4ef71f5bf9c888a24':
  Fix hang