tree 96a45d931fc70ae774e7532f8117515ebece3708
parent f991771f81953f5d355eb905d05a784ed7287016
author Dianne Hackborn <hackbod@google.com> 1392155781 -0800
committer Narayan Kamath <narayan@google.com> 1392199894 +0000

Fix build.

At least part of what is broken.  Other stuff still seems to be.

(cherry picked from 32bb5fae353b5bb6275e75952e89c514c7369cee)

Change-Id: I280376645166fe772ff7a31ff2e8494dce2adbf8