reconcile android-2.1_r1 snapshot
reconcile main tree with open-source eclair
am bff01c69: reconcile main tree with open-source eclair

Merge commit 'bff01c69cb84d9bf444edfb181b32b0240893aac' into eclair-plus-aosp

* commit 'bff01c69cb84d9bf444edfb181b32b0240893aac':
  android-2.1_r1 snapshot
am 7643a1fc: am bff01c69: reconcile main tree with open-source eclair

Merge commit '7643a1fcce0798ff46f485759f4527e5c8067ba7'

* commit '7643a1fcce0798ff46f485759f4527e5c8067ba7':
  android-2.1_r1 snapshot
Add an original-package tag that matches the real package name.

Change-Id: Ic1a0b7eb8ac2cdda51c45c828c280f808a52246a
Add an empty CleanSpec.mk

Change-Id: I80809bf3cb90c7fecf1ff0f1612f43fba78d4c8b
Add missing NOTICE and tag file

Bug: 2548782
Change-Id: I97a49587a0dfd41890d03465ea376a5d81744356
For issue #2651381, allow library prelinking.

Change-Id: I37ed64d0dd79d8abec89262f83c5dc06343bd65e
am 4ee507f2: For issue #2651381, allow library prelinking.

Merge commit '4ee507f260bb4cfa02c59bc2d0d39b1724947ff9' into froyo-plus-aosp

* commit '4ee507f260bb4cfa02c59bc2d0d39b1724947ff9':
  For issue #2651381, allow library prelinking.
Fix showing wrong punctuation key as comma key

It's showing comma key when clicking punctuation key.
Correct the output label at skb_phone.xml

Change-Id: Idb5aec74b934092c1c717a17dee52eb617809f09
Remove Pinyin from acore.

That way, it doesn't appear to have dozen of very scary
permissions.

Explicitly add the permissions it actually needs.

Change-Id: If845e4ddccf9a8c4c9a648cadd3b0d7235eb79e4
Merge "Fix showing wrong punctuation key as comma key"
No longer use this private API.

Change-Id: I9b748f1ddfddb8d0a27b26fc72dfc1756c1438b0
Adding LOCAL_MODULE_TAGS := optional to PinyinIME

Change-Id: Ice5dfba97d2f1ccba759b9cf3ba1d3a4451964af
Adding LOCAL_MODULE_TAGS := optional to PinyinIME

Change-Id: Ice5dfba97d2f1ccba759b9cf3ba1d3a4451964af
Reconcile with ics-mr1-release

Change-Id: I86fca75cb9890224a58cb2385514cc3b83373883
PinyinIME: Add required library for package

Previous commit 9b32b99cbe494373b3d4ecd8976c9a4e385d745b
changed library libjni_pinyinime.so to be optional.
This change adds the library as a requirement for PinyinIME
package.

Change-Id: Ie308cc6492eed97d1780f13bc38918c138ec7572
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
Merge "PinyinIME: Add required library for package"
provent nativeImOpenDecoder from being removed by proguard

Because it's not been used anywhere, it could be removed by proguard,
and that causes the libjni_pinyinime.so fail to be loaded.
Merge "provent nativeImOpenDecoder from being removed by proguard"