| commit | f284e01c2cb1db6f3e6820197427d5b2da28b500 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed Sep 16 23:10:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 23:10:15 2015 +0000 |
| tree | 4a897a91c3e253fa63ca263229b06ec8b93f5afe | |
| parent | 35c9483278cc50f7063955fe76c67305606fc13e [diff] | |
| parent | 489c534b3c96faca24a257a3e2afce03e800861f [diff] |
am 489c534b: am 095641df: (-s ours) am 0518125e: am e1289226: am dc81adaa: am c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev * commit '489c534b3c96faca24a257a3e2afce03e800861f': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.