OSDN Git Service

(root) / android-x86 / dalvik.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f870f2d 2d2f13c)
am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger resul...
authoryroussel <yroussel@google.com>
Mon, 12 Nov 2012 20:07:43 +0000 (12:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 20:07:43 +0000 (12:07 -0800)
* commit '2d2f13c50ba3c38dc4a8a8aaf483f6df155e0080':
  Fix alignment when recompacting a DexMerger result. do not merge.


Trivial merge
dalvik
About OSDN
Find Software
Develop Software
Help