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