tree f20868fe70d8c19bd2d0c6d3e69325ee6c041cdf
parent 937dba18c32af5030999daf8d4e9aa3d4cf3b705
parent 842c1a748de0ec938bf27629bee950e69bb2fcb4
author Marco Nelissen <marcone@google.com> 1547499854 -0800
committer android-build-merger <android-build-merger@google.com> 1547499854 -0800

Merge "Add samplerate and bitspersample keys" am: 25b0f8dc2a am: 69b22687b8
am: 842c1a748d

Change-Id: Id52dab8294a5bc3a8c4187688e0fe1719df585fa