tree cee73e41079ee48b1abc34575c4c245e6a3e7874
parent 96c5528258878d59a929a4b33e2e4b012197e335
parent f077abb00ba4003738c3ca5c8133e2e3d22692c6
author Wei Jia <wjia@google.com> 1442530989 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442530989 +0000

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 'f077abb00ba4003738c3ca5c8133e2e3d22692c6':
  DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.