tree 03c3c09a92f139d3b6715468c23393628388b1d5
parent d37bf4e99509aeb98706a1a2d273f39b92c7cfdb
parent 25e75abac2c9229c0c4741e33f504a341a36ad94
author Ying Wang <wangying@google.com> 1397605358 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397605358 +0000

am 25e75aba: am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."

* commit '25e75abac2c9229c0c4741e33f504a341a36ad94':
  Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.