tree 75875a7f0293c18546fc22a23d546d5e58f6ff33
parent e3cceef7ececdac1c6df65d3f7a1557ac3ce5e3c
parent 83a538e40ed8bdcda64c4bb5a448c0357b8e5e73
author Selim Gurun <sgurun@google.com> 1398985065 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398985065 +0000

am 83a538e4: (-s ours) Merge "DO NOT MERGE Add DrawGlInfo kModeProcessNoContext"

* commit '83a538e40ed8bdcda64c4bb5a448c0357b8e5e73':
  DO NOT MERGE Add DrawGlInfo kModeProcessNoContext