| commit | 5a026501def9ad03b85c72159359d8e8bf58066a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 08 07:41:45 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 08 07:41:49 2010 -0700 |
| tree | d21eacefb448230b6cefda408a429fa92da6889f | |
| parent | 35003ca8aeb0d007efedc87ef0f2a9558294d4fa [diff] | |
| parent | b273b20c6052f14868d803040cc2d78b330358cb [diff] |
Manual merge of b273b20c "am a96c501e: Mark ip-up-vpn as optional" Change-Id: I6bb8a4ac696ebb2ba24895698ff0a853117ab769