tree 261017ba7a9f590b2534be4d67ee0ac8bc9026c9
parent aac4184a5a0ab969140a11e1ef258fcb4cba07a9
parent 63fcb397a2583255ec4a0f5e5d8c4c124c272616
author Scott Main <smain@google.com> 1319730588 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1319730588 -0700

Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0