commit | bb516b845db892f38a304605138476971b973949 | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Sun Sep 20 01:10:07 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:10:07 2015 +0000 |
tree | f3449b5b4b1e8fb0e69e31a292075477be6ea99c | |
parent | d514081abf76c6d8bd17d785a29316ecf01c6e9f [diff] | |
parent | 35cdb5c89ff8b3318f54338520982475bbf704f4 [diff] |
am 35cdb5c8: 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 '35cdb5c89ff8b3318f54338520982475bbf704f4': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.