tree 25d41dabda547c9e2a1a060d8720e8d3ee4de2be
parent 8969d9924c662ab4cdacc342bbdc33756db730be
author Brian Carlstrom <bdc@google.com> 1308767711 -0700
committer Brian Carlstrom <bdc@google.com> 1308767711 -0700

Fix build.

git cherry-pick --no-commit  22a614142aacce13fc46a0e524dbfb6ca56bf237

Change-Id: I1409bc3dd1f1b3027c12355e8b6aeffa2d857c83