tree f4e92e2b2a896d875719baa75d24251d46653d1e
parent 6d45f85db513cbba993cc36ad6c7a0fd47df38d9
parent ce31fe2fb8727d3624daca7a4018546ea4328191
author Par-Gunnar Hjalmdahl <pargunnar.hjalmdahl@sonymobile.com> 1536193888 -0700
committer android-build-merger <android-build-merger@google.com> 1536193888 -0700

Merge "Convert AudioAttribute to Stream correctly" am: 024387744a
am: ce31fe2fb8

Change-Id: I0901d4076b693d43796fa5552dc0ee5ac383b70e