| commit | 35cdb5c89ff8b3318f54338520982475bbf704f4 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Sun Sep 20 01:00:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:00:22 2015 +0000 |
| tree | 05f56e70007b9fdd0df14a7f72e69c755ea33df8 | |
| parent | c391d8871eb63afa0c505b54ddcc6910ef2f8844 [diff] | |
| parent | af321dc195b74d3c3201ec72eb44df1bc7ca433e [diff] |
am af321dc1: (-s ours) am 3b3cbeb3: am 2701ab04: am f077abb0: am 4022477b: am 8cfd0ac4: (-s ours) am 741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev * commit 'af321dc195b74d3c3201ec72eb44df1bc7ca433e': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.