tree d2b9c3b6cfb9b707a739258f6dc615dd118f3b4e
parent c2861c569867bd4f65d8264b6027b658322f0e57
parent 2d5156733c4b35e3ba21ddf932c2595ee690aaeb
author Beverly <beverlyt@google.com> 1528503101 -0700
committer android-build-merger <android-build-merger@google.com> 1528503101 -0700

Merge changes from topic "audio-package-update"
am: 2d5156733c

Change-Id: I051fc7af9663a90ff5b7e080dd44001646d35089