| commit | 15920fa94559ddff48b0d2e83b5f086c49fb5c67 | [log] [tgz] |
|---|---|---|
| author | Katie McCormick <kmccormick@google.com> | Tue Nov 06 11:03:26 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 11:03:26 2012 -0800 |
| tree | ffeb7223cd0fcb786a826cce4da5367a7e4c4461 | |
| parent | 36c8ceb0ab5e16280b6b83bc7d7d8fe99cbeee36 [diff] | |
| parent | 130b7e43f91e154cd1e9a63c37089c223c3e1f1e [diff] |
am 130b7e43: Merge "cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2" into jb-mr1-dev * commit '130b7e43f91e154cd1e9a63c37089c223c3e1f1e': cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2