tree 485b152b97bf8321fdd223f35587bb4294672be8
parent 8962170b2ae34fab3a3feefb2a3a78bee593e78b
parent 90bb222c3ec1c7bf5f5997197808de09a91932bf
author Robert Ly <robertly@google.com> 1326998625 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326998625 -0800

am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0

* commit '12310ee801553e63091ce3bda6f07a5be31a473c':
  docs: wifi direct