commit | f077abb00ba4003738c3ca5c8133e2e3d22692c6 | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Sat Sep 12 09:46:17 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 09:46:17 2015 +0000 |
tree | 317b1390a400c8496655e6ff053e585512448c01 | |
parent | d8b9218c4e8449fb1d87750ced7ab26a28019627 [diff] | |
parent | 4022477b7c1e809d4ea31c47ae42555255a4ea4d [diff] |
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.