Learn more about cloning repositories
You have read-only access
resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718
