OSDN Git Service

am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0
authorRobert Ly <robertly@google.com>
Thu, 19 Jan 2012 18:43:45 +0000 (10:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Jan 2012 18:43:45 +0000 (10:43 -0800)
commit52bd79fb14cd32492f4d29961499bd1945b29cc0
tree485b152b97bf8321fdd223f35587bb4294672be8
parent8962170b2ae34fab3a3feefb2a3a78bee593e78b
parent90bb222c3ec1c7bf5f5997197808de09a91932bf
am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0

* commit '12310ee801553e63091ce3bda6f07a5be31a473c':
  docs: wifi direct