| commit | ab8f1ba0ec9d66db2f653b08f4caa24a27b3a996 | [log] [tgz] |
|---|---|---|
| author | Robert Ly <robertly@google.com> | Thu Jan 19 10:43:45 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 19 10:43:45 2012 -0800 |
| tree | 37565daa6d2c437c1896bea30e29f3aff6ffd979 | |
| parent | ab9601cdbb95ae94088750eff9a926a572c1a4d6 [diff] | |
| parent | 12310ee801553e63091ce3bda6f07a5be31a473c [diff] |
am 12310ee8: am 9575a1ab: Merge "docs: wifi direct" into ics-mr0 * commit '12310ee801553e63091ce3bda6f07a5be31a473c': docs: wifi direct