tree 625835f17fa645a0222bf3835e9f95d88ce7bf8f
parent 3ecb11e099e8c0c84381c38775103cc7d42234d6
parent 94bbfa47b043c50e10e6558e461d018b7d13bb5d
author Nick Pelly <npelly@google.com> 1254080852 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254080852 -0700

am 94bbfa47: Merge change 27142 into eclair

Merge commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d' into eclair-plus-aosp

* commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d':
  Handle expiration of discovery mode in system server.