tree 074e7760d7ff701f54b05bf208951a05ebfa8ab5
parent 53f5a69fa90063967ab768757eb9f68d23fa22b4
parent 9165daa8814064b90837d29950ea8712d8149369
author Iliyan Malchev <malchev@google.com> 1347952167 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347952167 -0700

am 9165daa8: am 6c24db2d: Merge "mako: remove setup_fs" into jb-mr1-dev

* commit '9165daa8814064b90837d29950ea8712d8149369':
  mako: remove setup_fs