am 9afeda05: (-s ours) am e47e3f38: Merge "Manual merge of change 53051 from...
am 9afeda05: (-s ours) am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread
Merge commit '9afeda05'
* commit '9afeda05':
Manual merge of change 53051 from master (DO NOT MERGE)