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

* commit 'aa96db5ba0a39d8fac0925871632031d21e1ab3e':
  Fix mako builds. Do not merge.
This commit is contained in:
Jean-Baptiste Queru 2013-02-20 14:03:19 -08:00 committed by Android Git Automerger
commit 55779c4316

Diff Content Not Available