| commit | b8b34ba9f5e1fb545276dc95ff57859e26188265 | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@google.com> | Thu Oct 18 18:14:38 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 18 18:14:38 2012 -0700 |
| tree | 08b56252a0539ea8b6f7d763bdac24c1f2aa0b49 | |
| parent | ecb7f618576300e5d729c1aab2938169634f0d33 [diff] | |
| parent | 6dc2c7a535f960870f8bf644410574eec2650e88 [diff] |
am 6dc2c7a5: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev * commit '6dc2c7a535f960870f8bf644410574eec2650e88': Control OpenGL traces from Developer Options in Settings