tree 958d68e3d2b4626d5188e9b599371cc8b14f8384
parent 1a3bd5d7c1e82afe404f13e933c3a380e460b3e5
parent 04e41374bbe3198c6c4694eec6e74ade13d1260c
author Joe Onorato <joeo@android.com> 1279218661 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279218661 -0700

am 1c3da619: am 0f0e6f10: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread

Merge commit '1c3da6197c677339cfdd41a948a5f79f804d6e4e'

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