| commit | 6aa152a1df3f77b5838a62194fc196e04d8a5c6a | [log] [tgz] |
|---|---|---|
| author | Jaikumar Ganesh <jaikumar@google.com> | Tue Jun 07 10:01:28 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 07 10:01:28 2011 -0700 |
| tree | 21397cc376aac6e7355258e445d106010fa97e9e | |
| parent | e046555b4d92179327d12d888be967fff5c027ca [diff] | |
| parent | c8410017502dacff43ecd3e0926049b99fc186a8 [diff] |
am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread * commit 'c8410017502dacff43ecd3e0926049b99fc186a8': Remove discoverable timeout handler. DO NOT MERGE