tree 5302de0b326ff79a662ebd96f678e6fb80d4ca45
parent d0bbe528e427c5627b2821b646115a120e1a0a6d
parent 73f51a0fc5c20ee852367643527b46902f31e9bf
author Jean-Baptiste Queru <jbq@google.com> 1346088403 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346088403 -0700

am 73f51a0f: Merge "Fix ANR happens in "com.android.musicfx" at "keyDispatchingTimedOut""

* commit '73f51a0fc5c20ee852367643527b46902f31e9bf':
  Fix ANR happens in "com.android.musicfx" at "keyDispatchingTimedOut"