tree 99f4d78d9d929beb165926d7fb400c6f26ec5837
parent 1e7fb7aed7b00cebc8f0e501c911727af6527523
parent c3fba3be74669d59141a25b36e3a07a8e2605144
author The Android Open Source Project <initial-contribution@android.com> 1301432075 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1301432083 -0700

Merge from gingerbread

Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb