tree 46896c2ca06278a7d63b70d7e626511bfa71032d
parent bef261ccde80a06257e51dc16efdc1ae5b356282
parent e94c27a17fd56fd5ac63fc2de9df08cfcc80b1e3
author Mikhail Naganov <mnaganov@google.com> 1471903970 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1471903971 +0000

Merge "audioflinger: Fix battery accounting for offload tracks" into nyc-mr1-dev