commit | 3e600474654e4ab9f0b55a1b3f254a40863f2f42 | [log] [tgz] |
---|---|---|
author | Trevor Johns <trevorjohns@google.com> | Wed Jul 24 16:37:11 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 24 16:37:11 2013 -0700 |
tree | 7b98d0e05d2f6a25277c973f6a1aa218e4318a12 | |
parent | 091ad8d7fe11242da38e3882a1e8aa12409d728d [diff] | |
parent | bf854c920f8554134adce646789d82f5303d4f6e [diff] |
am bf854c92: am a587cd16: am 8598f3ad: Merge "Move BasicNetworkDemo/NetworkConnect to 2-level structure" into jb-mr2-dev * commit 'bf854c920f8554134adce646789d82f5303d4f6e': Move BasicNetworkDemo/NetworkConnect to 2-level structure