| commit | 8f4b1fe13bb408aca71a375c5fb53a888ba017bb | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Sep 17 02:45:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 02:45:25 2015 +0000 |
| tree | 67f97a5ac83ff641a18cefae289f5a47d1efdd89 | |
| parent | dc74672f73cf7cdafefc8f3037720b4bae5a6126 [diff] | |
| parent | cf7a59d1a23d4064f1fdb46609dfdc1e2d6be8af [diff] |
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 'cf7a59d1a23d4064f1fdb46609dfdc1e2d6be8af': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.