commit | 4b33d1351cc2713a05a49da00368a9e891c1f21b | [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 | b4650e655ca3660dc2047dd7c5a1e7e1e9f58dfc [diff] | |
parent | 7b99c34d4d55ff022a5ccae8ecc3c76a58d63328 [diff] |
am 18bd34d0: am 0fc85731: (-s ours) am 1333694c: Merge "system/audio.h: Make function inline" * commit '18bd34d0d35c5c7699128ba1c172b32d03e1a21f': system/audio.h: Make function inline