commit | 45679d942fa47b947b4ce7b45b82998b2972928d | [log] [tgz] |
---|---|---|
author | Jaikumar Ganesh <jaikumar@google.com> | Tue Jun 21 14:08:20 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 21 14:08:20 2011 -0700 |
tree | 4f446192d5ba3632e3fa4940252cbb4d050d0b78 | |
parent | 47504c7b93823a7e5a0e0b4d9b0ca8f5093f79f9 [diff] | |
parent | 38ae9125b4535d44b608359f3345fd75d99cc7a5 [diff] |
am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread * commit '38ae9125b4535d44b608359f3345fd75d99cc7a5': DO NOT MERGE Show user dialog for BT.