| commit | 6d0e799a8952f0c3c0a8f94ea8b06f42ce40986a | [log] [tgz] |
|---|---|---|
| author | Katie McCormick <kmccormick@google.com> | Tue Nov 06 11:08:19 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 11:08:19 2012 -0800 |
| tree | 6e6f75474cf479d9e3462e4a19bd91b179e0ded4 | |
| parent | 529c766225895876cdff376f49148b0ddcfd0060 [diff] | |
| parent | c42a143ddb9b7489c8788c891318410997e553d5 [diff] |
am c42a143d: am 15920fa9: am 130b7e43: Merge "cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2" into jb-mr1-dev * commit 'c42a143ddb9b7489c8788c891318410997e553d5': cherrypick from ics-mr1 docs: network sample Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2