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