tree adce850566e5dfc1a51f9bd6b68675bbb55c791a
parent 8def6f8e7d6c004ebaff1eb3eb71c48a94b1e948
parent d4f5386a47fede765bfb1bc1a600828fa51693d8
author Android (Google) Code Review <android-gerrit@google.com> 1254080534 -0400
committer Android (Google) Code Review <android-gerrit@google.com> 1254080534 -0400

Merge change 27142 into eclair

* changes:
  Handle expiration of discovery mode in system server.