summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2010-04-20 11:48:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-20 11:48:09 -0700
commit86e5a3b0168a6b61abbb1d5f66805e8c40646c85 (patch)
treee12493e7eef9950f16847e02d1f4e680da84d5b7
parent471ae8e8cce87393fb12988730e3a2a1be56983c (diff)
parent4dd73c65e43aaefcbcb0999830e92a49a250a435 (diff)
downloadframeworks_native-86e5a3b0168a6b61abbb1d5f66805e8c40646c85.zip
frameworks_native-86e5a3b0168a6b61abbb1d5f66805e8c40646c85.tar.gz
frameworks_native-86e5a3b0168a6b61abbb1d5f66805e8c40646c85.tar.bz2
am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo
Merge commit '19275cb5b028c18228674f87ba4cbc98d8520c5e' into froyo-plus-aosp * commit '19275cb5b028c18228674f87ba4cbc98d8520c5e': Remove code to pass the nonexistant lockprofsample flag to Dalvik.
0 files changed, 0 insertions, 0 deletions