tree 649149bcf8144c364f98339d6c8eba8540dc6523
parent f1298246581874025998ec434477ae90d4d39181
parent d029b2378170cfd7bb34d894482065a762a54578
author The Android Open Source Project <initial-contribution@android.com> 1295647480 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1295647491 -0800

merge from gingerbread

Change-Id: I99e03b97ed48d1cc6cbd4176a55b1e06fc5ca5c1