tree da6084f542177972cf72a985b5d2c10330f87de3
parent 89fe6cee915a25427a51290fa300e7b8e2c95dab
parent e6af9624ea5aef381c14b4fb7e7c92a11ad64bb7
author The Android Open Source Project <initial-contribution@android.com> 1242884470 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1242884470 -0700

Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'

Conflicts:
	api/current.xml
	core/res/res/values/public.xml