tree 485b152b97bf8321fdd223f35587bb4294672be8
parent b82dd313e75b4940d6568f35b8b04efe7dcb071d
parent 75991b50d8119f20d0caef032876342354802967
author Robert Ly <robertly@google.com> 1326998488 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326998488 -0800

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

* commit '9575a1ab5d033248284d59b2a2ae6eda80f79762':
  docs: wifi direct