tree b1b230e529427573e5be1172aad7d2b669ff01c3
parent 20c7adbfaabe401ad111b2ff28ea44b287bd49c0
parent 8a9a2e24db868fba404049d700ae704b0982e5f3
author Colin Cross <ccross@android.com> 1392755154 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392755154 +0000

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

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