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