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