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.
This commit is contained in: