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