tree fa4e4e2f7958717431b132f0219bf58581f89434
parent d7732e4b308836ed21723c1ab412f640f02abdf1
author Chris Masone <cmasone@chromium.org> 1306267710 -0700
committer Chris Masone <cmasone@chromium.org> 1306270289 -0700

[shill] Build is broken...bad merge??

BUG=None
TEST=FEATURES=test emerge-x86-generic shill

Change-Id: I78e646c1d532adc374a7db28628238c8c4c30bdb
Reviewed-on: http://gerrit.chromium.org/gerrit/1471
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>