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