OSDN Git Service

am 818b1423: (-s ours) Fix mako builds. Do not merge.
authorJean-Baptiste Queru <jbq@google.com>
Wed, 20 Feb 2013 22:00:43 +0000 (14:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Feb 2013 22:00:43 +0000 (14:00 -0800)
* commit '818b1423d228e478245a1b0d2fe687606ea1741c':
  Fix mako builds. Do not merge.


Trivial merge