tree dca3b3d3c3686d4d5fd4d100baaaf724cd16cd3d
parent 91ce04432a021acc0ea542e5ef970f684f5d1541
parent e5796382cc49f05be99a2dc0d5b38f4c617fcf14
author The Android Automerger <android-build@android.com> 1312329123 -0700
committer The Android Automerger <android-build@android.com> 1312329123 -0700

Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release

Conflicts:
	core/build_id.mk

Change-Id: If3af1b8a02be0eff4373ff62469ccee820ffeb6a