Commit 0f796ace75e069679520a0b80bf965b4c991a7f4

Geoff Lang 2014-08-25T10:33:24

Fix compilation error due to bad merge. Change-Id: I54b3e0423e41b86b28d93fdce8d4d2d3304d56cf Reviewed-on: https://chromium-review.googlesource.com/213822 Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>