tree 815e891ff7b93581a86769bdf28f3ba88128d577
parent d21c05f9b38ee17ee95db5a3db2b7a503f3775b1
parent 71c7f86a3076726e186da7cbb00af10ac6a3c58e
author Mikhail Naganov <mnaganov@google.com> 1557856599 -0700
committer android-build-merger <android-build-merger@google.com> 1557856599 -0700

Merge "Remove USE_XML_AUDIO_POLICY_CONF build flag" am: 23a08f7dc5
am: 71c7f86a30

Change-Id: I45b828b7284e5cbe139cbf8a882258dab16479bd