summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/12/changes
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-04-09 14:25:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-09 14:25:20 -0700
commit74a2a5dae0b014adcc75859ede854761dfefd499 (patch)
tree949408a6a6e28ad2c7a7915e9cd095ced914f84c /docs/html/sdk/api_diff/12/changes
parent3aa5aaa4eeafe50463af4ccedef07d0a54b917b1 (diff)
parent273703935d185b82e5d5e8a0ae2363743558227f (diff)
am 27370393: am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev
* commit '273703935d185b82e5d5e8a0ae2363743558227f': Turn back on global proxy support.
Diffstat (limited to 'docs/html/sdk/api_diff/12/changes')
0 files changed, 0 insertions, 0 deletions