commit | 55d2aa7dd5bf7d8a7b942632619bde13324ee903 | [log] [tgz] |
---|---|---|
author | Andrew Hsieh <andrewhsieh@google.com> | Thu Mar 14 13:38:32 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 14 13:38:32 2013 -0700 |
tree | 9428bc5da884c0c23d3e385776cd8757e1e80962 | |
parent | b3825b548848cf6bd9c7659985cb407ea0fda94c [diff] | |
parent | 342a2ae9f28849f6c388faf3f289b64c4bbbb0b3 [diff] |
am 342a2ae9: Merge "Fix OpenSLES_AndroidConfiguration.h to be usable for C code" * commit '342a2ae9f28849f6c388faf3f289b64c4bbbb0b3': Fix OpenSLES_AndroidConfiguration.h to be usable for C code