Learn more about cloning repositories
You have read-only access
Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp