OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41ffef2 30bec90)
am 30bec90c: (-s ours) resolved conflicts for merge of 5ee9454d to mnc-dev-plus-aosp
authorSebastien Hertz <shertz@google.com>
Thu, 27 Aug 2015 03:48:22 +0000 (03:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 03:48:22 +0000 (03:48 +0000)
* commit '30bec90cc47aa16c23161d65d062e1fa87157b76':


Trivial merge
art
About OSDN
Find Software
Develop Software
Help