tree 3b30c6164e2ee577360bc9bc0ce8c7f872a554f3
parent 8ff53be7c9bcb47c78df0b1968e08deebac8b688
parent 58565f26f89c2ba0c09c024a0bd3e1c61b1ae615
author Nick Kralevich <nnk@google.com> 1367855076 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367855076 -0700

am 58565f26: Revert "mako: temporatily remove kickstarter\'s old root files"

* commit '58565f26f89c2ba0c09c024a0bd3e1c61b1ae615':
  Revert "mako: temporatily remove kickstarter's old root files"