Commits
Nick Pelly authored and Android Git Automerger committed f02aaabcb9aM
am 528961a6: am 94bbfa47: Merge change 27142 into eclair Merge commit '528961a61d99280e67fbb13b78b3d2538c3025d5' * commit '528961a61d99280e67fbb13b78b3d2538c3025d5': Handle expiration of discovery mode in system server.
Showing diff to15039f91d00