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