tree 114190d5eef42dcf1c331b19b15917f7268c87be
parent ecef1c1a31619782737230b5fd45718f20760ca9
parent 8758a3e3941bae9ef11948506950521c4682acf1
author Jamie Gennis <jgennis@google.com> 1365543981 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365543981 -0700

am 8758a3e3: Merge changes I82e361a6,I83694682 into jb-mr2-dev

* commit '8758a3e3941bae9ef11948506950521c4682acf1':
  libgui_test: increase the tolerance for a YUV test
  libgui: fix an EGLImage leak