tree 623afc0442352bf9b2a01f0ff6d03ca35ace8e57
parent eb4915bffdd76affee4a4f9b78df6369afd0a431
author Vinit Deshpande <vinitd@google.com> 1429128178 -0700
committer Vinit Deshpande <vinitd@google.com> 1429128199 -0700

Fix build issues after the merge

Change-Id: Ia856311187a0b2168cb859bd8b2300ff59df6569