OSDN Git Service

am 1bf2bed1: (-s ours) am e1a56162: (-s ours) am 83a538e4: (-s ours) Merge "DO NOT...
authorSelim Gurun <sgurun@google.com>
Thu, 1 May 2014 23:04:59 +0000 (23:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 May 2014 23:04:59 +0000 (23:04 +0000)
* commit '1bf2bed1507872dbc5cdefef6f6d3e5a7f83daa2':
  DO NOT MERGE Add DrawGlInfo kModeProcessNoContext


Trivial merge