tree cc55c56f5a823692e49ead62215339f330147d21
parent 85b9edf2da0534bc53d139bb88cda8866d265afe
parent e4474c3b7098a13bc81b0dba35bacd93b8a22f79
author Chia-chi Yeh <chiachi@android.com> 1317940183 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317940183 -0700

Merge "ConnectivityService: detach the logic of global proxy."