commit | b11bdfbf13cbdbfd77a636d767455f87b7e4bff6 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 24 10:16:28 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 24 10:16:28 2010 -0700 |
tree | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 | |
parent | e83f259acfd7738500d0b6191af0382d25227b63 [diff] | |
parent | a10ea3b34e6101cac16c150a2585ac978eb72b3e [diff] |
am b13c9bc5: manual merge Merge commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6' * commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6': BluetoothHeadset.java: