Learn more about cloning repositories
You have read-only access
resolved conflicts for merge of 0716ea14 to honeycomb-merge Change-Id: I8f5e40c83a470e81910cd07f11fe683bb6f96421