tree 317b1390a400c8496655e6ff053e585512448c01
parent d8b9218c4e8449fb1d87750ced7ab26a28019627
parent 4022477b7c1e809d4ea31c47ae42555255a4ea4d
author Wei Jia <wjia@google.com> 1442051177 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442051177 +0000

am 4022477b: am 8cfd0ac4: (-s ours) am 741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev

* commit '4022477b7c1e809d4ea31c47ae42555255a4ea4d':
  DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.