| commit | 615357b952a10305787b5268878eed48cb0bd8a7 | [log] [tgz] |
|---|---|---|
| author | Pablo Ceballos <pceballos@google.com> | Wed Mar 30 20:03:17 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Mar 30 20:03:17 2016 +0000 |
| tree | f2707eacde5e14089ed912127e91858ce8c8dbfa | |
| parent | ec4c4548dd2c02242b965162372e7bb4c6d03345 [diff] | |
| parent | d9d32bb094c6ba254a4680bc41c9d05aa94826f4 [diff] |
Merge changes If65b4e6c,If993b7f7 * changes: NDK GLES: Updates to android-24 NDK GLES: copy android-21 to android-24