| commit | 962568d7b7ef4ae6a38727bbe5661be0c2d37107 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Sun Sep 20 01:38:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:38:52 2015 +0000 |
| tree | 75affab3545a2543ceb5825191156b58414e40c1 | |
| parent | bba4b99f398d2347a6dd6027794c5161a824b56b [diff] | |
| parent | 76b74b77263b146f05837479da422e452ff4ccb5 [diff] |
am 76b74b77: (-s ours) am d65fac63: am bb516b84: 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 '76b74b77263b146f05837479da422e452ff4ccb5': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.