| commit | 76d9d4fe93f9c17fc1af9d035925218b627b480d | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Mar 14 13:41:02 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 14 13:41:02 2013 -0700 |
| tree | 5ae7feda2eef3ddff19609d61c25d63e5528608c | |
| parent | f6151b661a719a1c825043d277aea6834c079d8f [diff] | |
| parent | 55d2aa7dd5bf7d8a7b942632619bde13324ee903 [diff] |
am 55d2aa7d: am 342a2ae9: Merge "Fix OpenSLES_AndroidConfiguration.h to be usable for C code" * commit '55d2aa7dd5bf7d8a7b942632619bde13324ee903': Fix OpenSLES_AndroidConfiguration.h to be usable for C code