| commit | ca06c307910a827f4d96a1c294ed8f78b97d4b35 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 14 14:04:10 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 14 14:04:10 2013 -0700 |
| tree | fb62c151d14f375bb2a1963fa5b20425b415a460 | |
| parent | 6e6819f7b8b4820ae2b1003a516fe9aa60fa478e [diff] | |
| parent | 5b2eece6aaa1c2e56ebb42240cd855bfd22a3a9e [diff] |
am 5b2eece6: (-s ours) Reconcile with klp-release - do not merge * commit '5b2eece6aaa1c2e56ebb42240cd855bfd22a3a9e': Merge remote-tracking branch 'goog/dalvik-dev' into merge-art-to-dalvik-dev