tree 05f416d9d7563115e3a2a12457e2f3ee89a92682
parent 1f839d92100c5f05cbd52b8f5d0671d984a48334
parent e4360c8e14d1ea362fb1d13b7a5c9bf003f3be00
author Colin Cross <ccross@android.com> 1395337630 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395337630 +0000

am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"

* commit 'e4360c8e14d1ea362fb1d13b7a5c9bf003f3be00':
  bootanimation: build 32-bit if 64-bit gl libraries are not available