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