tree 395dec9ab1b065c3038f013b9f7628a888f483f0
parent 52eb953278ad68ba5e5995feb1c8f8d43a7af4c9
parent a3633c25033b576ae160ea86194e4f7f20d82fe2
author Colin Cross <ccross@android.com> 1395349540 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395349540 +0000

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

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