| commit | 12310ee801553e63091ce3bda6f07a5be31a473c | [log] [tgz] |
|---|---|---|
| author | Robert Ly <robertly@google.com> | Thu Jan 19 10:41:28 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 19 10:41:28 2012 -0800 |
| tree | 2b545b12222a7a8760767de94cfcad8b78ba216b | |
| parent | 230a709285abc5dfd92f05d91a8997d52a59d3c7 [diff] | |
| parent | 9575a1ab5d033248284d59b2a2ae6eda80f79762 [diff] |
am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 * commit '9575a1ab5d033248284d59b2a2ae6eda80f79762': docs: wifi direct