am 2f45dbfc: (-s ours) am ace15025: Merge "Follow up change of I8b38e280 (DO...
am 2f45dbfc: (-s ours) am ace15025: Merge "Follow up change of I8b38e280 (DO NOT MERGE)" into gingerbread
Merge commit '2f45dbfc'
* commit '2f45dbfc':
Follow up change of I8b38e280 (DO NOT MERGE)