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