tree b7017008c41fb1a147784adb65e721df036c63ed
parent f93c7c70247fb11dc99361c309bd6bd7b859e30e
parent 6e3bbf64b2c8ac49b5b1e1ff368a120118c04e65
author Ying Wang <wangying@google.com> 1397604965 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397604965 +0000

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

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