tree d0b838dc905e648d28e4b9daa5f12e58b80b0a51
parent 5ba21b6024ee8a3d4bdb2acad6fe30dfcf5cb3cd
parent c2bd8101b8e26b9ebb2c079ae6867229dad3f196
author Kenny Guy <kennyguy@google.com> 1404309737 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1404236768 +0000

Merge "Revert "Revert Cls stopping now-master running on googlefood"" into ub-now-master