commit | 8e71f080b2b363e9a93a754cf6dc36699a5aeb8e | [log] [tgz] |
---|---|---|
author | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 06 14:45:23 2016 +0530 |
committer | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 06 14:45:23 2016 +0530 |
tree | a10c3b4e5f049416ea30df096463695264223a20 | |
parent | ea16a590fa06edc0a77bf60880e6ae81b965a297 [diff] | |
parent | edefe53f8b5ccc2339bec2d8fd9c7516aeb2d319 [diff] |
Merge commit 'edefe53f8b5ccc2339bec2d8fd9c7516aeb2d319' into remote Conflicts: include/hardware/bt_hf.h Change-Id: I46d7cf89a27ecc905edf2005839876b9971abf99