commit | 87445514bbb2d942ebe46a632c6c4ae956218ebc | [log] [tgz] |
---|---|---|
author | Carl Shapiro <cshapiro@google.com> | Tue Apr 20 11:50:45 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 20 11:50:45 2010 -0700 |
tree | bcd78f27aa16f4eb3ac56654238d126a8b1fa06e | |
parent | 91c474ab4e66c01daa8b6e6ee375239c56a80227 [diff] | |
parent | 86e5a3b0168a6b61abbb1d5f66805e8c40646c85 [diff] |
am 15feb4de: am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo Merge commit '15feb4defc61c7bded6fdd3ea1c3781f25666275' into kraken * commit '15feb4defc61c7bded6fdd3ea1c3781f25666275': Remove code to pass the nonexistant lockprofsample flag to Dalvik.