diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-11-13 18:48:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 18:48:31 -0800 |
| commit | a022c1933144e2406976cf23542606de8ba283ef (patch) | |
| tree | 54fe4aeeeb5b3254179d2f32324f3a8f6aadb5bc /docs/html/sdk/api_diff/11/changes | |
| parent | 62ca3a891d3a09f54a0c2de779b7e16c70484c03 (diff) | |
| parent | d4257e8f469eacc1ba8142b0b1bc4ca0327a7a0e (diff) | |
am d4257e8f: resolved conflicts for merge of ec9e8933 to klp-dev-plus-aosp
* commit 'd4257e8f469eacc1ba8142b0b1bc4ca0327a7a0e':
Fix for the invalid Global Proxy Setting
Diffstat (limited to 'docs/html/sdk/api_diff/11/changes')
0 files changed, 0 insertions, 0 deletions