| commit | 21e652c805dca32621b6e24f0e122a3f0dd6ecb5 | [log] [tgz] |
|---|---|---|
| author | Rom Lemarchand <romlem@android.com> | Mon Jun 01 23:01:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 23:01:12 2015 +0000 |
| tree | a667bac328d13ab2099247793b86f820e213619d | |
| parent | eb57cfde660d55a9ba291f0ba864e04396bd25ab [diff] | |
| parent | 18bd34d0d35c5c7699128ba1c172b32d03e1a21f [diff] |
am 18bd34d0: am 0fc85731: (-s ours) am 1333694c: Merge "system/audio.h: Make function inline" * commit '18bd34d0d35c5c7699128ba1c172b32d03e1a21f': system/audio.h: Make function inline