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