Merge commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp * commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d': relocate android.util.base64.* -> android.util.*
Merge commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp * commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d': relocate android.util.base64.* -> android.util.*