tree 9d52c784ebd68acfc44a2cdb06d7cf057bba2c91
parent 5adc399c76f432ce3301db5fa1da511351b70373
parent f9b7c243a4aade68347fafc5f83aa37196723cc9
author Evan Millar <emillar@google.com> 1277147380 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1277147380 -0700

Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread