Learn more about cloning repositories
You have read-only access
resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a