tree ecc9a252a3b05624421eb801fa6a91ea59055993
parent 0b181946435f5d27b8fd42aed9ce1194a13fc921
parent a3b31fba91da41ad12d4ed3272942b4208979d7d
author Joe Onorato <joeo@android.com> 1279217659 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279217659 -0700

am a3b31fba: am 2198ff81: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread

Merge commit 'a3b31fba91da41ad12d4ed3272942b4208979d7d'

* commit 'a3b31fba91da41ad12d4ed3272942b4208979d7d':
  The ICU data is no longer compiled directly into the shared library.