OSDN Git Service

(root) / android-x86 / dalvik.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b63e6c 7c3fb24)
am 7c3fb240: resolved conflicts for merge of e206e7c9 to jb-mr1-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Fri, 19 Oct 2012 22:08:26 +0000 (15:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Oct 2012 22:08:26 +0000 (15:08 -0700)
* commit '7c3fb24095a3f6cf2ca6e25ddb4af24933ff3e4d':
  Push to AOSP


Trivial merge
dalvik
About OSDN
Find Software
Develop Software
Help