am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev

* commit '8b98246559c7422e507458a63c8dfc2783bd0afc':
  Control OpenGL traces from Developer Options in Settings