summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-03-10am 57ed41b9: Merge "Add NOTICE and MODULE_LICENSE files"HEADmaster-soongmastermainConley Owens
2015-03-10Merge "Add NOTICE and MODULE_LICENSE files"Conley Owens
2015-03-09am 0cd5a85e: (-s ours) Merge "Change pairing_cb to assume temporary pairing b...Natalie Silvanovich
2015-03-09Merge "Change pairing_cb to assume temporary pairing by default"Natalie Silvanovich
2015-03-06Add NOTICE and MODULE_LICENSE filesConley Owens
2015-03-06Change pairing_cb to assume temporary pairing by defaultAndre Eisenbach
2015-03-03am 3e12cd50: Merge "reword channle to channel"Erik Kline
2015-03-03Merge "reword channle to channel"Erik Kline
2015-02-25reword channle to channelErik Kline
2015-02-19Fix the GCC build after fixing the clang build.Dan Albert
2015-02-19Ignore typdef redefintion warning to fix build.Dan Albert
2015-02-10am dfb3b2f2: Add flag indicating encrypted connections to btif_dm_get_connect...Andre Eisenbach
2015-02-07am d736b8d6: Merge "Fix some more missing libc includes."Christopher Ferris
2015-02-07Merge "Fix some more missing libc includes."Christopher Ferris
2015-02-06Fix some more missing libc includes.Ian Coolidge
2015-02-06Add flag indicating encrypted connections to btif_dm_get_connection_state()lollipop-mr1-devAndre Eisenbach
2015-02-06am d6f2fa93: am d6419cd6: am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: am...Andre Eisenbach
2015-02-06am e791f732: am ae9d174b: am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO...Andre Eisenbach
2015-02-06am 0ad6cfde: am ce5ae4ab: am a708936d: DO NOT MERGE Change pairing_cb to assu...Andre Eisenbach
2015-02-05am d6419cd6: am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-...Andre Eisenbach
2015-02-05am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-s ours) am 3e...Andre Eisenbach
2015-02-05am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NO...Andre Eisenbach
2015-02-05am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_...Andre Eisenbach
2015-02-05am ae9d174b: am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Ch...Andre Eisenbach
2015-02-05am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_...Andre Eisenbach
2015-02-05am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume ...Andre Eisenbach
2015-02-05am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume ...Andre Eisenbach
2015-02-05am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by de...Andre Eisenbach
2015-02-05am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by de...Andre Eisenbach
2015-02-05am ce5ae4ab: am a708936d: DO NOT MERGE Change pairing_cb to assume temporary ...Andre Eisenbach
2015-02-05am a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by de...Andre Eisenbach
2015-02-04am ff50e75d: Merge "Fix pthread_t confusion."Elliott Hughes
2015-02-04Merge "Fix pthread_t confusion."Elliott Hughes
2015-02-04am 481b0546: Merge "Fix non-standard pthread mutex interactions."Elliott Hughes
2015-02-04Merge "Fix non-standard pthread mutex interactions."Elliott Hughes
2015-02-03Fix pthread_t confusion.Ian Coolidge
2015-02-03DO NOT MERGE Change pairing_cb to assume temporary pairing by defaultAndre Eisenbach
2015-02-03DO NOT MERGE Change pairing_cb to assume temporary pairing by defaultAndre Eisenbach
2015-02-03DO NOT MERGE Change pairing_cb to assume temporary pairing by defaultAndre Eisenbach
2015-02-03Fix non-standard pthread mutex interactions.Ian Coolidge
2015-02-03am 1efdda75: Merge "btif_pan: Grab interface declarations from net/if.h only."Elliott Hughes
2015-02-03Merge "btif_pan: Grab interface declarations from net/if.h only."Elliott Hughes
2015-02-02btif_pan: Grab interface declarations from net/if.h only.Ian Coolidge
2015-01-30am a51404cf: Merge "Add missing <string.h> includes."Elliott Hughes
2015-01-30Merge "Add missing <string.h> includes."Elliott Hughes
2015-01-29Add missing <string.h> includes.Elliott Hughes
2015-01-30am 17d85406: Merge "bta_dm_search_cancel sends dm_search state machine comple...Prem Kumar
2015-01-30Merge "bta_dm_search_cancel sends dm_search state machine complete events" in...Prem Kumar
2015-01-29am 61331337: Merge "Add missing includes."Elliott Hughes
2015-01-29Merge "Add missing includes."Elliott Hughes