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