| commit | 26f40cc36dc869fc8de3bf4c97de57aae0d626ca | [log] [tgz] |
|---|---|---|
| author | Hui Lu <huilu@google.com> | Thu Jun 05 17:39:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 05 17:39:09 2014 +0000 |
| tree | 360a67027d3e3890c5373a6cd94cbfb7c0259b96 | |
| parent | 21483b9f0b5a92aec10d858d9e3525abd190504c [diff] | |
| parent | 61c0f547339ec870d42b15e84f9628631308f22f [diff] |
am 61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev * commit '61c0f547339ec870d42b15e84f9628631308f22f': Add interface name for proxy network type.