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
This commit is contained in:
commit
309ee97168