tree 9db09844b78d7fac1d8fd89940e7aa66523f167f
parent 35e44d4b757427a240e8764467bdd220e2124473
author Hall Liu <hallliu@google.com> 1447353018 -0800
committer Hall Liu <hallliu@google.com> 1447353018 -0800

Fix build breakage due to bad manual cherry-pick

Change-Id: I1a020321ba71760485aa4df2313d3877c4795f5a