tree 72d34411dbb38b64920f0651251bd9cc9d97ecd3
parent 559087b6ba1c423bf4f4be9323ddb8171516cf57
parent ebb41cc357ba8e04dd6aab48766a16540f084b42
author David 'Digit' Turner <digit@google.com> 1398687129 +0000
committer android-build-merger <android-build-merger@google.com> 1398687129 +0000

Merge "emulator/opengl: Fix GCC 4.8 warnings." into idea133
 Auto-merge: ebb41cc

* commit 'ebb41cc357ba8e04dd6aab48766a16540f084b42':
  emulator/opengl: Fix GCC 4.8 warnings.