Merge "Fix ANR happens in "com.android.musicfx" at "keyDispatchingTimedOut""
tree: 79be8c85c7fbb6c0f486d0e26f55fdbe09c499e1
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml