Learn more about cloning repositories
You have read-only access
resolved conflicts for merge of 691be97f to gingerbread-plus-aosp Change-Id: Ic095e7f9203eb1465ddf3c195ebf1200e9393124