tree 7bf312af50cad0917e372a3950e926581e9b0feb
parent 714078d91aa0ecbe29661aac869dc397d8884042
parent 3fe1b49071420903cb8e3082ec04e76296352690
author Mike Lockwood <lockwood@google.com> 1400184394 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> 1400184395 +0000

Merge "Submitted on behalf of 3rd party copied from external/bluetooth/bluedroid" into klp-wireless-dev