diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-07 15:00:12 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-07 15:00:12 -0700 |
| commit | 424de1779d54f979593c1d0924fc7890f82b0b33 (patch) | |
| tree | 49e3527699e1e5c463f5184b3853d5f4b336ecc5 /target | |
| parent | 3b008f36956c35f58d510ad3da5090cf21a08349 (diff) | |
| parent | 0f085e5a8525f492255d95c71f4e137efae85d01 (diff) | |
| download | build-424de1779d54f979593c1d0924fc7890f82b0b33.zip build-424de1779d54f979593c1d0924fc7890f82b0b33.tar.gz build-424de1779d54f979593c1d0924fc7890f82b0b33.tar.bz2 | |
resolved conflicts for merge of 0f085e5a to gingerbread-plus-aosp
Change-Id: If89721a5ee86b9ce27a2235ecd75f3eceec7def7
Diffstat (limited to 'target')
| -rw-r--r-- | target/product/core.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/product/core.mk b/target/product/core.mk index e1697d9..a1cc4df 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -41,6 +41,7 @@ PRODUCT_PACKAGES := \ framework-res \ hprof-conv \ icu.dat \ + ip-up-vpn \ jasmin \ jasmin.jar \ libcrypto \ |