tree a97c7b20718808adf0e8a88198e7d62ad40f4b33
parent 82b1dedac93c2bf6d189861e2b69dde6f35c5c68
parent e6203a4d300ac0bcc4ef6cbeba7b4560d71331b7
author Sameer Padala <sxp@google.com> 1400267823 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400267823 +0000

am e6203a4d: Merge "Fix build" into ub-now-nova

* commit 'e6203a4d300ac0bcc4ef6cbeba7b4560d71331b7':
  Fix build