am 818b1423: (-s ours) Fix mako builds. Do not merge.

* commit '818b1423d228e478245a1b0d2fe687606ea1741c':
  Fix mako builds. Do not merge.
This commit is contained in:
Jean-Baptiste Queru 2013-02-20 14:00:43 -08:00 committed by Android Git Automerger
commit aa96db5ba0

Diff Content Not Available