| commit | 2097b3b7e705753d7d5737f04cd133b941e79486 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Jul 17 12:30:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 17 12:30:35 2014 +0000 |
| tree | fc801258f09c0a59383a1269c447cbd26177e4fd | |
| parent | 14a67c7e703553eaf722514f7e2e6eda48922819 [diff] | |
| parent | 8839697e9cd8efb0c916fde9bbc292e552d21adf [diff] |
am 8839697e: Merge "Update OpenSLES_Android.h for API L" * commit '8839697e9cd8efb0c916fde9bbc292e552d21adf': Update OpenSLES_Android.h for API L