| commit | 969583e0e403d9a49024b279a407f167947419cc | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Sep 17 03:57:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 03:57:38 2015 +0000 |
| tree | 50de1aff38af4897e051ead970750061f773e65a | |
| parent | b579d1c49ef2b313af8703ae6d97e741a300d1f3 [diff] | |
| parent | 8f4b1fe13bb408aca71a375c5fb53a888ba017bb [diff] |
am 8f4b1fe1: (-s ours) am cf7a59d1: am f284e01c: 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 '8f4b1fe13bb408aca71a375c5fb53a888ba017bb': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.