| commit | b273b20c6052f14868d803040cc2d78b330358cb | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Oct 07 15:54:39 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 07 15:54:39 2010 -0700 |
| tree | d21eacefb448230b6cefda408a429fa92da6889f | |
| parent | 35003ca8aeb0d007efedc87ef0f2a9558294d4fa [diff] | |
| parent | a96c501e99bc7de068540225102854994e30cad1 [diff] |
am a96c501e: Mark ip-up-vpn as optional Merge commit 'a96c501e99bc7de068540225102854994e30cad1' into gingerbread-plus-aosp * commit 'a96c501e99bc7de068540225102854994e30cad1': Mark ip-up-vpn as optional