Learn more about cloning repositories
You have read-only access
resolved conflicts for merge of 27eecb70 to gingerbread Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1