| commit | abb57909e03663d477bc3d5bb299398880996106 | [log] [tgz] |
|---|---|---|
| author | Hui Lu <huilu@google.com> | Fri Jan 31 08:11:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 31 08:11:57 2014 +0000 |
| tree | 6126ec506269afb5d3e8990b906c1cb35bc587bb | |
| parent | 593cc7af274e75fb5ab7e3118e5cc0e22c147948 [diff] | |
| parent | 07f2933a070ad5324b01c38df13d67794b4c99ae [diff] |
am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev * commit '3cab7fc1b8f06166df3a58cf10d4a0db36bde788': Add proxy as another network.