| commit | 15609188082d0707ce369884ae8bf80dbc84bbf7 | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Mon Sep 14 22:27:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 14 22:27:55 2015 +0000 |
| tree | a94ff499e865d2bc71f73b2357f52305a22b1aed | |
| parent | 69c24d3c6e42472f3e4e155559be100dd6f7121a [diff] | |
| parent | 7423292ab446a0632c7ea7ddfa05a3457ba5a04b [diff] |
am 7423292a: (-s ours) am e01a0afb: am d7b1b9ad: (-s ours) Merge "DO NOT MERGE audioflinger: dont release wakelock during offload drain sequence" into cw-d-mr1-dev * commit '7423292ab446a0632c7ea7ddfa05a3457ba5a04b': DO NOT MERGE audioflinger: dont release wakelock during offload drain sequence