Google Git
Sign in
android/platform/dalvik.git/1396cdeb03bf25c33d461a734f6ce739c8c5bc32
commit
1396cdeb03bf25c33d461a734f6ce739c8c5bc32
[log]
author
Yohann Roussel <yroussel@google.com>
Fri Aug 21 14:50:34 2015 +0000
committer
Android Git Automerger <android-git-automerger@android.com>
Fri Aug 21 14:50:34 2015 +0000
tree
e18196e10b6539a00359359335015a085ddb1260
parent
b8a003c7b1a7a733049e6013d73b821786e198d7 [diff]
parent
72353f83ff4057a64ff1e5ae3bc4b90de93e6171 [diff]
am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '72353f83ff4057a64ff1e5ae3bc4b90de93e6171':
  Ensure deterministic multidex partitioning
tree: e18196e10b6539a00359359335015a085ddb1260
  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