tree d576b1f653bf4067dd1aa96d9897c538a8453f6f
parent 70d908303d04694eeeffa0f9e89d27ea5c8ccf80
parent 0aa94d40d15ef999dfb29a208c1c254d89909115
author Steven Moreland <smoreland@google.com> 1499801032 +0000
committer android-build-merger <android-build-merger@google.com> 1499801032 +0000

Merge "Move cplay to vendor." am: c85b75c41e am: 69470a8bd8 am: a6b05e6543
am: 0aa94d40d1  -s ours

Change-Id: I388dec64e4d49bc67d97b3d58dea836c733109ea