tree a98aed4569df620e437e4920d246241d3531dac0
parent 92c243afae15567f166d0059db5aff13b8849596
parent 09f774b7d3ad4e4205485b6997d44f7edd084598
author Jean-Baptiste Queru <jbq@google.com> 1290190837 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1290190837 -0800

resolved conflicts for merge of 09f774b7 to gingerbread-plus-aosp

Change-Id: I103db47198ad09783aa6539cde271df0fdb9c594