Merge "Merge "Free EGLImages at the end of the testcase" into nyc-dev am: 3bd02575e7...
authorMika Isojarvi <misojarvi@google.com>
Tue, 17 May 2016 16:16:12 +0000 (16:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 May 2016 16:16:12 +0000 (16:16 +0000)
am: 6c283b7d47

* commit '6c283b7d471942d489c7eaaf2a37a6d64d39891e':

Change-Id: Id7be193f8aaf09a2863d276fe6fcc4bbeb2a969f


Trivial merge