Commits
Siva Velusamy authored and Android Git Automerger committed d119210086aM
am c60b87a5: am a850f9a1: Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-mr1-dev * commit 'c60b87a54a2f50f8132b3760449590d4e699dca4': Do not preload videoeditor_jni since it breaks the emulator
Showing diff to4bd62e7c9fd