tree e07380e77d98d1bee8741747ca5e88db980f3c93
parent b37b312b829c7ab5107c2f96d0a95a557f67a831
parent d5fe844b41778bf87101fc0a0e4e37e779678c50
author Colin Cross <ccross@android.com> 1392754895 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392754895 +0000

am d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries"

* commit 'd5fe844b41778bf87101fc0a0e4e37e779678c50':
  Use /(vendor|system)/lib64/egl for 64-bit EGL libraries