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