| commit | dafe3a502739dfe6f6eaedf541742e0dfc5e02cd | [log] [tgz] |
|---|---|---|
| author | Alex Vakulenko <avakulenko@google.com> | Fri Nov 13 07:19:00 2015 -0800 |
| committer | Alex Vakulenko <avakulenko@google.com> | Fri Nov 13 15:33:29 2015 +0000 |
| tree | ed9256ac82c3c98cfe5aa6891b91d2315f84f1b9 | |
| parent | f8c9c66d69192c08043c182acea63481b32a7b77 [diff] | |
| parent | e61717c1fc8a64ebef6c148b1d1d7e5054c5aecf [diff] |
Merge remote-tracking branch 'origin/master' into merge-to-aosp Merged the following commits: - e61717c Fix the virtual lock device - f1fa93d Add fd event support to EventTaskRunner - 5ca27be Removing trailing whitespace from speaker.cc - b51b475 Adding handler for speaker device. - fdf7515 examples: fix prerequisites for debian - 82f215e Fixed check for pending tasks - a627e12 Run CURL in background thread.