summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/6
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-04-11 14:16:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-11 14:16:28 -0700
commit63582a790e891780f391a1f8c6ee30837455421f (patch)
tree43da3ec1a454b7a889b18586c024b20b433792d2 /docs/html/sdk/api_diff/6
parentc5931edb4c8d95e90ac739ec88d8fca2610a57f1 (diff)
parentccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a (diff)
am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
* commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a': Use CONNECTIVITY_INTERNAL for global proxy
Diffstat (limited to 'docs/html/sdk/api_diff/6')
0 files changed, 0 insertions, 0 deletions