tree 837d1033e5f99aa1ceebdfd4059683191db70aef
parent 041d44705205f7b36108bcc3a9dafe321e301221
parent 0ac89b459542ef88a8c61f45f0d6b680f9931ddf
author Ying Wang <wangying@google.com> 1397604874 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397604874 +0000

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

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