OSDN Git Service

(root) / android-x86 / dalvik.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15d51db 96cdc4c)
am 96cdc4ca: am ce0723cc: am 437f58a5: am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignm...
authoryroussel <yroussel@google.com>
Mon, 12 Nov 2012 20:16:35 +0000 (12:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 20:16:35 +0000 (12:16 -0800)
* commit '96cdc4cacdae25302cb5ec79e43063140411cbb7':
  Fix alignment when recompacting a DexMerger result. do not merge.


Trivial merge
dalvik
About OSDN
Find Software
Develop Software
Help