commit | fb7dca80a58ff6a444f44f315f0376fae474224d | [log] [tgz] |
---|---|---|
author | Fred Chung <fchung@google.com> | Thu Nov 17 15:56:36 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 17 15:56:36 2011 -0800 |
tree | 858ec0f70cbf4a6cb072708b192a6fc2d6b60395 | |
parent | 57ce98045947bcc871128f721dd9b4eed189a4fe [diff] | |
parent | 7f9c1c67ef135a5e7b8226a0003df525adc2593c [diff] |
am 7f9c1c67: (-s ours) am c2c77700: am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 * commit '7f9c1c67ef135a5e7b8226a0003df525adc2593c': DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e