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