tree 40efc8f487834cc88fe8ccf78d5cfac23ff5b04a
parent c558269b1ab8c4985b86a0f39338d42f162693f2
parent b96fe08540dcf7e90be56919ea9863f687da779c
author Romain Guy <romainguy@google.com> 1350357558 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350357558 -0700

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

* commit 'b96fe08540dcf7e90be56919ea9863f687da779c':
  Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps