tree fe2743140530e213de7ec95ea138c79aa40411ea
parent cd9cd758d6dc884220f86ff10812c9e33a978de5
parent 2235288538d0c1758315bba961200d0e2254dedd
author Justin Koh <justinkoh@google.com> 1393288196 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393288196 +0000

am 22352885: am bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev

* commit '2235288538d0c1758315bba961200d0e2254dedd':
  DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp