OSDN Git Service

am aa96db5b: (-s ours) am 818b1423: (-s ours) Fix mako builds. Do not merge.
authorJean-Baptiste Queru <jbq@google.com>
Wed, 20 Feb 2013 22:03:19 +0000 (14:03 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Feb 2013 22:03:19 +0000 (14:03 -0800)
commit55779c43166a061d5b2289527e5a28a563b068df
tree297a4ed592671c0b9c475d44106b084b87755afb
parent37d6d8e933a71d75e41fa7402b470c0e33ef6f40
parentaa96db5ba0a39d8fac0925871632031d21e1ab3e
am aa96db5b: (-s ours) am 818b1423: (-s ours) Fix mako builds. Do not merge.

* commit 'aa96db5ba0a39d8fac0925871632031d21e1ab3e':
  Fix mako builds. Do not merge.