| commit | 489c534b3c96faca24a257a3e2afce03e800861f | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed Sep 16 23:03:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 23:03:19 2015 +0000 |
| tree | 7548b26cedfecb9c77602e1a7afab1a90306a168 | |
| parent | 866a12a7c85da35479871428e1236b1b4ff0683b [diff] | |
| parent | 095641dfa56913a6c28b2ca414315b094a254b1c [diff] |
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 '095641dfa56913a6c28b2ca414315b094a254b1c': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.