| commit | 9040a2de547981d3d2db0359a3ac5a0a83c8305a | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Wed Jun 08 00:35:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 08 00:35:08 2016 +0000 |
| tree | d38aca7b1ed2bc0c8c913f57f401b4f058369719 | |
| parent | c81684e629a864a110d074e60ead9746372d1ff1 [diff] | |
| parent | 70fee88af415d555ef54506ffe3188435abdde16 [diff] |
Merge \\"Update OpenSLES_Android.h and OpenSLES_AndroidConfiguration.h for N API\\" am: 6925e3e774 am: 70fee88af4 Change-Id: I7c680aa360c59b95b9e6032b648d386a2f41088b