tree 72ba29a15f2425c09402c3de5ee0970745714023
parent 9d0497bd4d59cec06f110b159da44fd0c20ad7c5
parent 8cfd0ac4b05f3151f1083564f46f05b5f525af8a
author Wei Jia <wjia@google.com> 1442047761 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442047761 +0000

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

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