| commit | 376d9b87af12b6d1f42eafa20b03baf7216b06cf | [log] [tgz] |
|---|---|---|
| author | Jaikumar Ganesh <jaikumar@google.com> | Tue Jun 07 17:53:41 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 07 17:53:41 2011 -0700 |
| tree | c9b3d8d195036ac9026989e2640cdba59bbd30f0 | |
| parent | cb0c55ed37495dfd5b04a80c9e024f91ba926109 [diff] | |
| parent | 6aa152a1df3f77b5838a62194fc196e04d8a5c6a [diff] |
am 6aa152a1: (-s ours) am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread * commit '6aa152a1df3f77b5838a62194fc196e04d8a5c6a': Remove discoverable timeout handler. DO NOT MERGE