diff options
| author | Kenny Root <kroot@google.com> | 2014-06-11 14:45:07 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2014-06-11 14:45:07 -0700 |
| commit | abc3e194a24da8eacbcc5b35c9c74495b1e23c3f (patch) | |
| tree | f389835d2262ce8612d2a7115bb9b7dfb389b4ec /src/hardware.c | |
| parent | 5b468d97a3489b7e42c70506f15e3887d8925fd3 (diff) | |
| parent | 205829a4e9d536aec6b176eeee6a8cf098f7ccc2 (diff) | |
| download | android_hardware_broadcom_libbt-abc3e194a24da8eacbcc5b35c9c74495b1e23c3f.tar.gz android_hardware_broadcom_libbt-abc3e194a24da8eacbcc5b35c9c74495b1e23c3f.tar.bz2 android_hardware_broadcom_libbt-abc3e194a24da8eacbcc5b35c9c74495b1e23c3f.zip | |
resolved conflicts for merge of 205829a4 to master
Change-Id: Idf06f97b88b6298c3f0a974d7465755d7b531d0f
Diffstat (limited to 'src/hardware.c')
0 files changed, 0 insertions, 0 deletions