| commit | 18c4b085de5da9122f87e229c7e22fa66e551cc7 | [log] [tgz] |
|---|---|---|
| author | Pablo Ceballos <pceballos@google.com> | Tue Apr 05 17:47:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 05 17:47:18 2016 +0000 |
| tree | 7930c2cd086de8427dff20662c97b49d2b6cc5ef | |
| parent | 640137c9238fd98821e8451d6cdb47a3ef43eda8 [diff] | |
| parent | 4eb20b8b0c8e501cb308364f013e84f8b7f137f7 [diff] |
Merge changes I727a2ca6,Ic3918978 am: 4eb20b8 * commit '4eb20b8b0c8e501cb308364f013e84f8b7f137f7': GLES NDK: Build break fix Revert "Revert "Merge changes If65b4e6c,If993b7f7"" Change-Id: I5bf0ef61fd9a9b11926262397a309399cda817d2