OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37d6d8e aa96db5)
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)
* commit 'aa96db5ba0a39d8fac0925871632031d21e1ab3e':
  Fix mako builds. Do not merge.


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help