tree ef6362635dd68504e32d54762d9b78cf82a749ec
parent 0d799e0964368f67b6ec1d6d3fac90d061a7d160
parent 7eada54037b5476bfc1cc4a3e8933defa0b04096
author Xavier Ducrohet <xav@android.com> 1295235757 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295235757 -0800

am 7eada540: Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread

* commit '7eada54037b5476bfc1cc4a3e8933defa0b04096':
  Move SDK component to 2.4 - DO NOT MERGE.