commit | 76b74b77263b146f05837479da422e452ff4ccb5 | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Sun Sep 20 01:33:23 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:33:23 2015 +0000 |
tree | b17479249c47abc216a206a5a0f2f5ebd9cd38e5 | |
parent | 4a287f3a7c723a9cf32ba6cb977e87fce7d794b1 [diff] | |
parent | d65fac632aa1cb89ce37cec6870c980960392b4d [diff] |
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 'd65fac632aa1cb89ce37cec6870c980960392b4d': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.