| commit | b98c2fb0998b2ad6bffe9c06dd358ba4705eaa4b | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Thu Oct 18 13:44:27 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 18 13:44:28 2012 -0700 |
| tree | b8defb05b6e4ccbc1935a1ecd843bae607c66f0a | |
| parent | 58e60c239f1d08a67a154d974cab9711a1dd7ecc [diff] | |
| parent | 62fa6de135269a7da135bb89b1eb047a4f11d343 [diff] |
Merge "Do a clean shutdown of p2p" into jb-mr1-dev