Commit Graph

410 Commits

Author SHA1 Message Date
Eino-Ville Talvala b8de151fd8 Add mobile filter framework java library to core target files.
Change-Id: Ia4892d8c49be905ec68423224ca44c8558edbdb8
2011-07-01 10:29:08 -07:00
Jean-Baptiste Queru bf6bb50f31 Revert "resolved conflicts for merge of 972433bd to master"
This reverts commit 5d0ec1aebb, reversing
changes made to 4839e47309.
2011-06-24 08:48:31 -07:00
David 'Digit' Turner 5d0ec1aebb resolved conflicts for merge of 972433bd to master
Change-Id: I1320aa02110af4b1cf25d2afde1bd4b587fcb10f
2011-06-24 13:45:26 +02:00
David 'Digit' Turner 972433bdad am 18447019: am 4b227c70: am f9f83ed1: Merge "emulator: Enable dex-preoptimization"
* commit '1844701942de578bab6c7f17e14ef695bb8ed7c1':
  emulator: Enable dex-preoptimization
2011-06-23 05:28:08 -07:00
David 'Digit' Turner 456d16cb89 emulator: Enable dex-preoptimization
This enables the Dex pre-optimization for emulator-specific builds.
The idea is to speed up the initial boot sequence of an SDK AVD by
avoiding the costly on-device preopt pass that is performed otherwise
the first time the AVD is launched.

Benchmarking shows reductions in first boot time from 1m30s to 40s
on a 2.4GHz Xeon when emulating the AOSP master ToT.

Change-Id: I67a9ce9791220c202817864c6e83dc8fd9cbc027
2011-06-22 23:23:46 +02:00
David 'Digit' Turner 1ccb41ee12 am 1c5df439: am 4f9479bf: am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
* commit '1c5df4396b581df771212ffad891e970702f97c9':
  emulator: Build emulator platform images as ARMv7-A
2011-06-21 15:27:10 -07:00
Brett Chabot 13fe14afe5 Merge "Add layoutlib-tests to sdk build." 2011-06-21 11:27:24 -07:00
Eric Fischer cf2e7ce98e Merge "Expand the full languages list to include the new locales." 2011-06-20 12:02:46 -07:00
David 'Digit' Turner 1c5df4396b am 4f9479bf: am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
* commit '4f9479bfdbc38e9bc06a5cf0a4bf67214fb358a8':
  emulator: Build emulator platform images as ARMv7-A
2011-06-20 09:10:58 -07:00
Eric Fischer a89d26ae40 Expand the full languages list to include the new locales.
Change-Id: I20ee5547109d6fd70a00d5661f7242f37e17bde5
2011-06-17 17:33:18 -07:00
Ryo Fujii c0de1ea8df Merge "fix broken build rules for host VM." 2011-06-17 17:25:04 -07:00
Brett Chabot a04dd5eef5 Add layoutlib-tests to sdk build.
Change-Id: I9087da4484b23f8eb0602210006038a395047a79
2011-06-17 16:57:04 -07:00
Eric Laurent 99acb9c261 created speex resampler library
Change-Id: I4424cb40416d94ccf4637fbbb53f02d595c31e3d
2011-06-17 14:21:17 -07:00
Ryo Fujii cbb3266b47 fix broken build rules for host VM. 2011-06-17 11:58:58 -07:00
David 'Digit' Turner 5f5056f503 emulator: Build emulator platform images as ARMv7-A
Now that the emulator supports proper ARMv7 emulation, switch to
building all emulator-specific platform images using this instruction
set, in order to benefit from the noticeable speed boost provided by
Thumb-2 instructions.

Note that we don't build with NEON support because emulated NEON
instructions are currently slow, though they work.

IMPORTANT: You need to have the following emulator patch in your tree
           in order to start these platform builds easily:

           https://review.source.android.com//#change,23798

Otherwise, the alternative is to do these things:

   1/ Telling the emulator to emulate an ARMv7-A CPU, instead of
      an ARMv5TE one. This is normally done with "-qemu cortex-a8"

   2/ Using an ARMv7-A capable kernel image, which is available and
      usable with -kernel prebuilt/android-arm/kernel-qemu-armv7

Note that the emulator has a special hack that automatically enables
1/ if 2/ is being used (i.e. if the kernel image name ends with -armv7,
then emulate an ARMv7-A CPU automatically).

So in reality, only 2/ is required.

Change-Id: I5c0245ba5e6a2bc34d0d49b2c024fffd317a5eed
2011-06-16 00:27:26 +02:00
Gloria Wang 68755c997b Enable Forward Lock DRM plugin.
Change-Id: Ida8694bad0b68e1941e00145b85fabb42d92fd72
2011-06-14 10:42:16 -07:00
Ying Wang dc31d76b5d Use TARGET_BOARD_INFO_FILE to locate board-info.txt
So board-info.txt can be inherited from the parent device.

Change-Id: I5d99a2483b9a325e475f3c602d9e0f5d2b95e80c
2011-06-13 17:36:08 -07:00
Jean-Baptiste Queru d057285063 Add DRM libraries
They're used in all products

Change-Id: I125e693df2ec012ca3e5461ba9ada8c21c529ef7
2011-06-10 15:13:52 -07:00
Jean-Baptiste Queru 91a5e65123 Remove photo and video editors from full builds
Change-Id: I5541fee3cd28a550945414510bc1e8141bc818fd
2011-06-10 14:22:27 -07:00
Chia-chi Yeh 2bcdd1e2ff Merge "Add VpnDialogs for user space VPN." 2011-06-08 18:57:37 -07:00
Eino-Ville Talvala 6f45ba1daa Merge "Ensure all filter framework libraries are included." 2011-06-08 10:27:25 -07:00
Doug Kwan b26e497374 Add libgabi++. We need this for RTTI.
Change-Id: I0cae803b16babf84e7be2e80681d33469ce43964
2011-06-07 15:09:19 -07:00
Eino-Ville Talvala a3ab691118 Ensure all filter framework libraries are included.
Change-Id: I48f75868b4082d2b47c451ffc7251dfa5b25e8c1
2011-06-07 15:04:38 -07:00
Brian Carlstrom 976672b4e6 Merge "Add KeyChain to core product defintion since Browser depends on it" 2011-06-07 10:30:30 -07:00
Brian Carlstrom 869727e575 Add KeyChain to core product defintion since Browser depends on it
Change-Id: I7c8ca42565875e72c7297c41d8bcb9cf1c1b4664
2011-06-06 21:35:47 -07:00
Jean-Baptiste Queru 679432ab1b Fix typo
Change-Id: I45e5fbe272f837e751eea14162432de1af1c67a2
2011-06-06 10:20:04 -07:00
Jean-Baptiste Queru 45f9c0e34e Tweak apps in "full" configs.
Add new apps. Also move VoiceDialer to only appear in
telephony-enabled builds.

Change-Id: I3560c19f841296be0c7438553e870df12a4c8cda
2011-06-06 09:50:18 -07:00
Chia-chi Yeh 3a712fb0fa Add VpnDialogs for user space VPN.
Also remove CryptKeeper as it was merged into Settings.

Change-Id: I2f2be7e7f78dbb7c303a30c79d2f6ebcc96b9951
2011-06-03 17:57:03 -07:00
Mathias Agopian 915db3c40b Merge "add sensorservice package to the list" 2011-05-27 16:38:05 -07:00
Eric Laurent f4c1487458 Added audio effects config file.
A configuration file named audio_effects.conf is now used
to list audio effect libraries and engines to be loaded by the
effects factory. A default version of this file is installed
in /system/etc. OEMs can override this file by placing a file
with the same name under /vendor/etc.

Change-Id: Id10e0e54f53234ec52b22b6f882734edaf2648ac
2011-05-27 15:30:42 -07:00
Hugo Hudson d8c42b1af8 Merge "Add the voicemail provider to the core packages." 2011-05-27 11:43:03 -07:00
Jaikumar Ganesh 9b6a4b0a27 Merge "Remove bluetooth configuration file." 2011-05-27 11:38:50 -07:00
Hugo Hudson 61fec12d7f Add the voicemail provider to the core packages.
Change-Id: I6a9f14a1129afffa0f80fb33977a98654ea61ccf
2011-05-27 11:54:10 +01:00
Mathias Agopian 64029f26c6 add sensorservice package to the list
Change-Id: I1ab54a7461095f37ea8bdeb480caffafe96a9522
2011-05-26 21:53:25 -07:00
Marius Renn 10e408bbe8 Added libfilterfw to core.mk.
Change-Id: Idb4c50bec8ae4328849736a7a120343276b45766
2011-05-26 18:06:55 -07:00
Jaikumar Ganesh d2576b77aa Remove bluetooth configuration file.
This now needs to be controlled on a per product basis
rather than telephony / no telephony basis.

Change-Id: I581bc0e027f844c1f7b7262c3833d8f727c3c9ec
2011-05-26 11:11:21 -07:00
Jean-Baptiste Queru 772a0f6794 Switch to mksh as the default shell.
Switch the emulator builds to ash to make sure it still
works, in case we find that we need to go back to using ash.

Change-Id: Id5641940b63cc4225011be1c375f4c86ec4d21cc
2011-05-18 13:49:08 -07:00
Andreas Huber 2a954b1add Add stagefright software decoders to core.mk
Change-Id: I9ecb8bbf179607bcdcb37db43cc11248201ea41f
related-to-bug: 4427361
2011-05-16 09:42:49 -07:00
Christopher Tate 38e11482d5 Add bu and BackupRestoreConfirmation to the core build
The 'bu' program is used by the platform's local backup mechanism
to stream a 'tar'-compatible dump of application packages/data.

BackupRestoreConfirmation is the UI for verifying that the user
did is aware of & grants permission for a requested full backup or
restore operation.

Change-Id: I3a3fe345e89d09838bddc4010d429e1374e19440
2011-05-10 17:53:27 -07:00
Brian Carlstrom 84d1ee8ab3 Avoid loading all CA certs into Zygote memory, lazily load instead (1 of 3)
Previously the CA certs stored in the BKS KeyStore at
/system/etc/security/cacerts.bks was loaded in the Zygote. As the the
number of CAs are started to increase, this is causing more and more
memory to be used for rarely used CAs. The new AndroidCAStore KeyStore
implementation reads the CAs as needed out of individual PEM
certificate files. The files can be efficiently found because they are
named based on a hash CA's subject name, similar to OpenSSL.

Bug: 1109242

Details:

build

    Removing old cacerts.bks from GRANDFATHERED_ALL_PREBUILT and
    adding new cacerts directory to core PRODUCT_PACKAGES

	core/legacy_prebuilts.mk
	target/product/core.mk

libcore

    cacerts build changes. Move cacerts prebuilt logic to new
    CaCerts.mk from NativeCode.mk where it didn't make sense. Updated
    Android.mk's dalvik-host target to install new cacerts files.

	Android.mk
	CaCerts.mk
	NativeCode.mk

    Remove old cacerts.bks and add remove certimport.sh script used to
    generate it.

	luni/src/main/files/cacerts.bks
	luni/src/main/files/certimport.sh

    Recanonicalize cacerts files using updated vendor/google/tools/cacerts/certimport.py
    (See below discussion of certimport.py changes for details)

	luni/src/main/files/cacerts/00673b5b.0
	luni/src/main/files/cacerts/03e16f6c.0
	luni/src/main/files/cacerts/08aef7bb.0
	luni/src/main/files/cacerts/0d188d89.0
	luni/src/main/files/cacerts/10531352.0
	luni/src/main/files/cacerts/111e6273.0
	luni/src/main/files/cacerts/1155c94b.0
	luni/src/main/files/cacerts/119afc2e.0
	luni/src/main/files/cacerts/11a09b38.0
	luni/src/main/files/cacerts/12d55845.0
	luni/src/main/files/cacerts/17b51fe6.0
	luni/src/main/files/cacerts/1920cacb.0
	luni/src/main/files/cacerts/1dac3003.0
	luni/src/main/files/cacerts/1dbdda5b.0
	luni/src/main/files/cacerts/1dcd6f4c.0
	luni/src/main/files/cacerts/1df5ec47.0
	luni/src/main/files/cacerts/1e8e7201.0
	luni/src/main/files/cacerts/1eb37bdf.0
	luni/src/main/files/cacerts/219d9499.0
	luni/src/main/files/cacerts/23f4c490.0
	luni/src/main/files/cacerts/27af790d.0
	luni/src/main/files/cacerts/2afc57aa.0
	luni/src/main/files/cacerts/2e8714cb.0
	luni/src/main/files/cacerts/2fa87019.0
	luni/src/main/files/cacerts/2fb1850a.0
	luni/src/main/files/cacerts/33815e15.0
	luni/src/main/files/cacerts/343eb6cb.0
	luni/src/main/files/cacerts/399e7759.0
	luni/src/main/files/cacerts/3a3b02ce.0
	luni/src/main/files/cacerts/3ad48a91.0
	luni/src/main/files/cacerts/3c58f906.0
	luni/src/main/files/cacerts/3c860d51.0
	luni/src/main/files/cacerts/3d441de8.0
	luni/src/main/files/cacerts/3e7271e8.0
	luni/src/main/files/cacerts/418595b9.0
	luni/src/main/files/cacerts/455f1b52.0
	luni/src/main/files/cacerts/46b2fd3b.0
	luni/src/main/files/cacerts/48478734.0
	luni/src/main/files/cacerts/4d654d1d.0
	luni/src/main/files/cacerts/4e18c148.0
	luni/src/main/files/cacerts/4fbd6bfa.0
	luni/src/main/files/cacerts/5021a0a2.0
	luni/src/main/files/cacerts/5046c355.0
	luni/src/main/files/cacerts/524d9b43.0
	luni/src/main/files/cacerts/56b8a0b6.0
	luni/src/main/files/cacerts/57692373.0
	luni/src/main/files/cacerts/58a44af1.0
	luni/src/main/files/cacerts/594f1775.0
	luni/src/main/files/cacerts/5a3f0ff8.0
	luni/src/main/files/cacerts/5a5372fc.0
	luni/src/main/files/cacerts/5cf9d536.0
	luni/src/main/files/cacerts/5e4e69e7.0
	luni/src/main/files/cacerts/60afe812.0
	luni/src/main/files/cacerts/635ccfd5.0
	luni/src/main/files/cacerts/67495436.0
	luni/src/main/files/cacerts/69105f4f.0
	luni/src/main/files/cacerts/6adf0799.0
	luni/src/main/files/cacerts/6e8bf996.0
	luni/src/main/files/cacerts/6fcc125d.0
	luni/src/main/files/cacerts/72f369af.0
	luni/src/main/files/cacerts/72fa7371.0
	luni/src/main/files/cacerts/74c26bd0.0
	luni/src/main/files/cacerts/75680d2e.0
	luni/src/main/files/cacerts/7651b327.0
	luni/src/main/files/cacerts/76579174.0
	luni/src/main/files/cacerts/7999be0d.0
	luni/src/main/files/cacerts/7a481e66.0
	luni/src/main/files/cacerts/7a819ef2.0
	luni/src/main/files/cacerts/7d3cd826.0
	luni/src/main/files/cacerts/7d453d8f.0
	luni/src/main/files/cacerts/81b9768f.0
	luni/src/main/files/cacerts/8470719d.0
	luni/src/main/files/cacerts/84cba82f.0
	luni/src/main/files/cacerts/85cde254.0
	luni/src/main/files/cacerts/86212b19.0
	luni/src/main/files/cacerts/87753b0d.0
	luni/src/main/files/cacerts/882de061.0
	luni/src/main/files/cacerts/895cad1a.0
	luni/src/main/files/cacerts/89c02a45.0
	luni/src/main/files/cacerts/8f7b96c4.0
	luni/src/main/files/cacerts/9339512a.0
	luni/src/main/files/cacerts/9685a493.0
	luni/src/main/files/cacerts/9772ca32.0
	luni/src/main/files/cacerts/9d6523ce.0
	luni/src/main/files/cacerts/9dbefe7b.0
	luni/src/main/files/cacerts/9f533518.0
	luni/src/main/files/cacerts/a0bc6fbb.0
	luni/src/main/files/cacerts/a15b3b6b.0
	luni/src/main/files/cacerts/a3896b44.0
	luni/src/main/files/cacerts/a7605362.0
	luni/src/main/files/cacerts/a7d2cf64.0
	luni/src/main/files/cacerts/ab5346f4.0
	luni/src/main/files/cacerts/add67345.0
	luni/src/main/files/cacerts/b0f3e76e.0
	luni/src/main/files/cacerts/bc3f2570.0
	luni/src/main/files/cacerts/bcdd5959.0
	luni/src/main/files/cacerts/bda4cc84.0
	luni/src/main/files/cacerts/bdacca6f.0
	luni/src/main/files/cacerts/bf64f35b.0
	luni/src/main/files/cacerts/c0cafbd2.0
	luni/src/main/files/cacerts/c215bc69.0
	luni/src/main/files/cacerts/c33a80d4.0
	luni/src/main/files/cacerts/c527e4ab.0
	luni/src/main/files/cacerts/c7e2a638.0
	luni/src/main/files/cacerts/c8763593.0
	luni/src/main/files/cacerts/ccc52f49.0
	luni/src/main/files/cacerts/cdaebb72.0
	luni/src/main/files/cacerts/cf701eeb.0
	luni/src/main/files/cacerts/d16a5865.0
	luni/src/main/files/cacerts/d537fba6.0
	luni/src/main/files/cacerts/d64f06f3.0
	luni/src/main/files/cacerts/d777342d.0
	luni/src/main/files/cacerts/d8274e24.0
	luni/src/main/files/cacerts/dbc54cab.0
	luni/src/main/files/cacerts/ddc328ff.0
	luni/src/main/files/cacerts/e48193cf.0
	luni/src/main/files/cacerts/e60bf0c0.0
	luni/src/main/files/cacerts/e775ed2d.0
	luni/src/main/files/cacerts/e7b8d656.0
	luni/src/main/files/cacerts/e8651083.0
	luni/src/main/files/cacerts/ea169617.0
	luni/src/main/files/cacerts/eb375c3e.0
	luni/src/main/files/cacerts/ed049835.0
	luni/src/main/files/cacerts/ed524cf5.0
	luni/src/main/files/cacerts/ee7cd6fb.0
	luni/src/main/files/cacerts/f4996e82.0
	luni/src/main/files/cacerts/f58a60fe.0
	luni/src/main/files/cacerts/f61bff45.0
	luni/src/main/files/cacerts/f80cc7f6.0
	luni/src/main/files/cacerts/fac084d7.0
	luni/src/main/files/cacerts/facacbc6.0
	luni/src/main/files/cacerts/fde84897.0
	luni/src/main/files/cacerts/ff783690.0

    Change IntegralToString.intToHexString to take width argument to
    allow for leading zero padding. Updated existing callers to
    specify 0 padding desired. Add testing of new padding
    functionality.

	luni/src/main/java/java/lang/Character.java
	luni/src/main/java/java/lang/Integer.java
	luni/src/main/java/java/lang/IntegralToString.java
	luni/src/test/java/libcore/java/lang/IntegralToStringTest.java

    Improved to throw Exceptions with proper causes

	luni/src/main/java/java/security/KeyStore.java
	luni/src/main/java/java/security/Policy.java
	luni/src/main/java/java/security/cert/CertificateFactory.java
	luni/src/main/java/javax/crypto/Cipher.java
	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java

    Indentation fixes

	luni/src/main/java/java/security/SecureRandom.java

    Fix X509CRLSelector.getIssuerNames to clone result and added test to cover this.

	luni/src/main/java/java/security/cert/X509CRLSelector.java
	luni/src/test/java/libcore/java/security/cert/X509CRLSelectorTest.java

    Fixed bug where we created an X500Principal via a String
    representation instead of from its original encoded bytes. This
    led to a difficult to track down bug where CA 418595b9.0 where the
    NativeCode.X509_NAME_hash of a Harmony (but not BouncyCastle)
    X509Certificate would not hash to the expected value because the
    encoded form used an ASN.1 PrintableString instead of the
    UTF8String form found in the original certificate.

	luni/src/main/java/org/apache/harmony/security/x501/Name.java

    Add a new RootKeyStoreSpi and register it as the
    AndroidCAStore. This new read-only KeyStore implementation that
    looks for certificates in $ANDROID_ROOT/etc/security/cacerts/
    directory, which is /system/etc/security/cacerts/ on devices. The
    files are stored in the directory based on the older md5 based
    OpenSSL X509_NAME_hash function (now referred to as
    X509_NAME_hash_old in OpenSSL 1.0)

	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/RootKeyStoreSpi.java
	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java

    Added OpenSSL compatible X509_NAME_hash and X509_NAME_hash_old
    functions for producting an int hash value from an X500Principal.

	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java

    Changed TrustManagerFactoryImpl to use AndroidCAStore for its default KeyStore

	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java

    Changed TrustManagerImpl to be AndroidCAStore aware. If it detects
    an AndroidCAStore, it avoids generating the acceptedIssuers array
    at constructions, since doing so would force us to parse all
    certificates in the store and the value is only typically used by
    SSLServerSockets when requesting a client certifcate. Because we
    don't load all the trusted CAs into the IndexedPKIXParameters at
    startup in the case of AndroidCAStore, we now check for new CAs
    when examining the cert chain for unnecessary TrustAnchors and for
    a newly discovered issuer at the end of the chain before
    validation.

	luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java

    Updated KeyStoreTest to cope with read only KeyStore. Update
    test_cacerts_bks (now renamed test_cacerts) to use the
    AndroidCAStore for validating system CA certificate
    validity. Register AndroidCAStore as an expected KeyStore type
    with StandardNames.

	luni/src/test/java/libcore/java/security/KeyStoreTest.java
	support/src/test/java/libcore/java/security/StandardNames.java

    Added test of X500Principal serialization while investigating Name
    encoding issue. However, the actual Name bug was found and
    verified by the new test_cacerts test.

	luni/src/test/java/libcore/javax/security/auth/x500/X500PrincipalTest.java

vendor/google

    Change canonical format for checked in cacerts to have PEM
    certificate at the top, as required by Harmony's X.509
    CertificateFactory.

	tools/cacerts/certimport.py

Change-Id: I35164580e04c6f79404de9e3139694c30c57eb8b
2011-04-29 00:48:44 -07:00
Dima Zavin af9e54f6c1 Merge "board/generic: pull in the goldfish audio hw" 2011-04-27 17:09:05 -07:00
Dima Zavin aa4ce45217 Merge "generic_no_telephony: always include stub audio/audio_policy HALs" 2011-04-27 17:08:51 -07:00
Dima Zavin 7f966f5a63 board/generic: pull in the goldfish audio hw
Change-Id: I8d38ca07951f35e71e700406589a8d021852ff31
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-26 20:13:45 -07:00
David 'Digit' Turner 0838f8f083 am 6e7926a6: am 55a461c9: am f245dd79: Merge "full_x86-eng: Ensure we copy the PC bios files."
* commit '6e7926a6cdd5fa6815266ecb16d6ba5410f8a182':
  full_x86-eng: Ensure we copy the PC bios files.
2011-04-26 12:45:47 -07:00
David 'Digit' Turner 6e7926a6cd am 55a461c9: am f245dd79: Merge "full_x86-eng: Ensure we copy the PC bios files."
* commit '55a461c9b1ab92bf6250650afcacc8de85c1e01a':
  full_x86-eng: Ensure we copy the PC bios files.
2011-04-26 10:24:22 -07:00
David 'Digit' Turner f245dd7975 Merge "full_x86-eng: Ensure we copy the PC bios files." 2011-04-25 23:25:38 -07:00
Dima Zavin 7fbe6bc99e generic_no_telephony: always include stub audio/audio_policy HALs
Change-Id: Ib48e622b2fb137e24517cb31e6c46b3795296b45
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-22 09:49:22 -07:00
Raphael 6d3bbf5678 am 5e3ce397: resolved conflicts for merge of 854354be to honeycomb-plus-aosp
* commit '5e3ce3972c5f5245115c1f3ed95efab66150d457':
  Add swtmenubar.jar to SDK
2011-04-15 17:25:55 -07:00
Raphael 5e3ce3972c resolved conflicts for merge of 854354be to honeycomb-plus-aosp
Change-Id: Iabd1ac0b63276067b094939b237c6e695fff0c9f
2011-04-15 17:13:44 -07:00
Raphael Moll 24434460b6 Add swtmenubar.jar to SDK
Change-Id: Ia46337875cb78bb6a01731008b9acbfa4657d0a9
2011-04-14 21:25:02 -07:00