OSDN Git Service

am ffbe7f83: (-s ours) am 22352885: am bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateW...
authorJustin Koh <justinkoh@google.com>
Tue, 25 Feb 2014 00:32:54 +0000 (00:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Feb 2014 00:32:54 +0000 (00:32 +0000)
* commit 'ffbe7f83ebc072d676e25c86d8ceb60205a9ec8a':
  DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp


Trivial merge