| commit | 1bf2bed1507872dbc5cdefef6f6d3e5a7f83daa2 | [log] [tgz] |
|---|---|---|
| author | Selim Gurun <sgurun@google.com> | Thu May 01 23:01:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 01 23:01:09 2014 +0000 |
| tree | ea17e6e804a7adadafbcfbf52d071de5c916eb83 | |
| parent | 8e95d9883666e2b4b1ce26b312d09ba42ae37f7a [diff] | |
| parent | e1a561620dd18dd71b65faafe5d2fad45794c80a [diff] |
am e1a56162: (-s ours) am 83a538e4: (-s ours) Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext" * commit 'e1a561620dd18dd71b65faafe5d2fad45794c80a': DO NOT MERGE Add DrawGlInfo kModeProcessNoContext