| commit | e01a0afb173128f2bce11f06e0dd3ac7d6d84756 | [log] [tgz] |
|---|---|---|
| author | Chris Elliott <chriselliott@google.com> | Mon Sep 14 22:05:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 14 22:05:15 2015 +0000 |
| tree | 25620a9e2319782e8c7d5cb7341b9846cd951941 | |
| parent | c0bdf755edf542afa7638b98296ff1c5e3cb870b [diff] | |
| parent | d7b1b9ad395cef08a9b48800c9cc16dd8b87d95a [diff] |
am d7b1b9ad: (-s ours) Merge "DO NOT MERGE audioflinger: dont release wakelock during offload drain sequence" into cw-d-mr1-dev * commit 'd7b1b9ad395cef08a9b48800c9cc16dd8b87d95a': DO NOT MERGE audioflinger: dont release wakelock during offload drain sequence