DESCRIPTION

WIP: CCCP

Change-Id: Ia71874207b5a213074e2ca525aa3eb37ff80e24b


COMMENTS

author: Natasha Sullivan
date: 2013-12-05 14:33:30.278000000

Uploaded patch set 2.

-------------------------------------
author: Tate Garrett
date: 2014-01-31 07:39:48.098000000

The change could not be merged due to a path conflict.

Please rebase the change locally and upload the rebased commit for review.

-------------------------------------
