am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." into honeycomb

* commit '54b0a7f3ff0411a215e7e23f1041d414a32147b5':
  Fix issue 3412777 ANR on adding effects.
tree: 957967ca93cd09aaa03a41ad7719f195496065a4
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE