Google Git
Sign in
android/platform/dalvik.git/refs/heads/marshmallow-dev
commit
ae03b0076973d5ece5fd300748c29098955afec7
[log]
author
Yohann Roussel <yroussel@google.com>
Fri Aug 21 14:56:15 2015 +0000
committer
Android Git Automerger <android-git-automerger@android.com>
Fri Aug 21 14:56:15 2015 +0000
tree
1087570ce72cf982aee460efb8a56eb8625b53ce
parent
6fe795a0dc629710ad27594ea837b234a9e8b289 [diff]
parent
1396cdeb03bf25c33d461a734f6ce739c8c5bc32 [diff]
am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
  Ensure deterministic multidex partitioning
tree: 1087570ce72cf982aee460efb8a56eb8625b53ce
  1. dexdump/
  2. dexgen/
  3. dexlist/
  4. docs/
  5. dx/
  6. libdex/
  7. opcode-gen/
  8. tools/
  9. Android.mk
  10. CleanSpec.mk
  11. MODULE_LICENSE_APACHE2
  12. NOTICE