OSDN Git Service

am af321dc1: (-s ours) am 3b3cbeb3: am 2701ab04: am f077abb0: am 4022477b: am 8cfd0ac...
authorWei Jia <wjia@google.com>
Sun, 20 Sep 2015 01:00:22 +0000 (01:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 20 Sep 2015 01:00:22 +0000 (01:00 +0000)
* commit 'af321dc195b74d3c3201ec72eb44df1bc7ca433e':
  DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.


Trivial merge