| commit | fa1fea64ffa0b85bbde94186cf984a712b1f2f4e | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Sun Sep 27 12:47:32 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 27 12:47:32 2009 -0700 |
| tree | adce850566e5dfc1a51f9bd6b68675bbb55c791a | |
| parent | 9d8212f8408c3f9e98e5c011d6260fd497fa5333 [diff] | |
| parent | c65b1a8f3ed13e0cac5f1be9871b3f1255dc0edb [diff] |
am 94bbfa47: Merge change 27142 into eclair Merge commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d' into eclair-plus-aosp * commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d': Handle expiration of discovery mode in system server.