| commit | 0f53379fb08e397111e7d012e21767102b5facb2 | [log] [tgz] |
|---|---|---|
| author | Pablo Ceballos <pceballos@google.com> | Wed Mar 30 20:10:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 30 20:10:49 2016 +0000 |
| tree | f2707eacde5e14089ed912127e91858ce8c8dbfa | |
| parent | 532aafdf430fa19745e0002bdf074f0b80802aa5 [diff] | |
| parent | 615357b952a10305787b5268878eed48cb0bd8a7 [diff] |
Merge changes If65b4e6c,If993b7f7 am: 615357b * commit '615357b952a10305787b5268878eed48cb0bd8a7': NDK GLES: Updates to android-24 NDK GLES: copy android-21 to android-24 Change-Id: Iee47efb469d10857a7112b6445e184445e883657