tree ba29316c6bd9d1807003dbc16888c19140dd1a79
parent 43dd91d40ac1dad66fb4bb848f3970b49b2ff58c
parent 08b5b6453b1455cff5f4fe6bb97f6b9164cb7c7b
author Android Build Merger (Role) <android-build-merger@google.com> 1496871152 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496871153 +0000

Merge "Merge "Remove powerlog from audio hal" into oc-dev am: 1631d1c56d am: 3272ac8ac4" into oc-dr1-dev-plus-aosp