tree a9e4ea69919c8e37ef377807b19effac9cc6593a
parent 837d2f9e83e7d8625ef482d9c9d9afa852c8dbaa
parent 1cffc80f978c55f09203d9d9a905775b951ba59a
author Romain Guy <romainguy@google.com> 1350351799 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1350351800 -0700

Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev