tree f17e33269cfecca5687d1175fd3858a1c265ac51
parent 19eca316ca4a6c3c59f7eb469b33473e0ad0405a
parent a2d776b2d36b38d94a30fc5692fd71ce9697fe9c
author The Android Open Source Project <initial-contribution@android.com> 1269298538 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1269298538 -0700

merge from open-source master

Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e