commit | 818217354e7122503a86c3acb274fafdd86ae972 | [log] [tgz] |
---|---|---|
author | Carl Shapiro <cshapiro@google.com> | Tue Apr 20 11:56:47 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 20 11:56:47 2010 -0700 |
tree | fc00e385a2f82a14c3ff6665f6fbcc96c789e896 | |
parent | 42123dd1bfe06889eb8cfb3cb941354ff30f3679 [diff] | |
parent | 87445514bbb2d942ebe46a632c6c4ae956218ebc [diff] |
am dbc108a7: am 15feb4de: am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo