tree 0be4d46fb77afa99928386169637410e921e424d
parent 738539670f87caa3edb6ba2b52f0ecba81ea25bd
author Nancy Chen <nancychen@google.com> 1425600384 -0800
committer Nancy Chen <nancychen@google.com> 1425600384 -0800

Fix build breakage.

Because of refactoring, can't directly use the cherrypick as is.

Change-Id: Ic0d7bd95701c955c6277b065e6975e238209ff9f