tree a97c7b20718808adf0e8a88198e7d62ad40f4b33
parent 6df24b7793b744055e4e388bc75ebb5c9f34cbe8
parent 66311fda410d083d105e9abfbffbd9ada457bc88
author Sameer Padala <sxp@google.com> 1400267710 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1400267717 +0000

Merge "Fix build" into ub-now-nova