Nick Pelly 528961a61d am 94bbfa47: Merge change 27142 into eclair
Merge commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d' into eclair-plus-aosp

* commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d':
  Handle expiration of discovery mode in system server.
2009-09-27 12:47:32 -07:00
..