Commits
Irfan Sheriff authored and Android Git Automerger committed 66be661c459M
am f1aabd93: am d895caf7: am b98c2fb0: Merge "Do a clean shutdown of p2p" into jb-mr1-dev * commit 'f1aabd93c2ed94c7fde77f0ba2444d2c4dfa01f2':
Showing diff to74a41fb5242