am 7caa7515: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
* commit '7caa7515f8673d9516620d2a5147be9e2233f1bb':
This commit is contained in: