| commit | bdd06f84660995a73df9c99ce5573b3f281ae8cc | [log] [tgz] |
|---|---|---|
| author | Pablo Ceballos <pceballos@google.com> | Wed Apr 06 20:05:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 06 20:05:06 2016 +0000 |
| tree | ce7e6900b8ee62f9a6dd0e7635a26b38bedf785a | |
| parent | 18c4b085de5da9122f87e229c7e22fa66e551cc7 [diff] | |
| parent | ce95b5213610bf4cd0f909a35bf3f3e040c7bb10 [diff] |
Merge changes If8a072ea,I8fead050 am: ce95b52 * commit 'ce95b5213610bf4cd0f909a35bf3f3e040c7bb10': NDK EGL: Build break fix Revert "Revert "Merge changes Icc59b133,I71814ffd,Idfdb90b5,Ie3bded59,Icaa93832, ..."" Change-Id: I0f3b141b5831364e6ed30f575b180d50fc92cdaf