tree bd3cd86085649cd64ff8e6b091ae1691a713eacc
parent b1293374d7bed9872278af3793f1b64c95d4913a
parent 67e82fb113d18e77c0ee2f7c06e832f3b73649b1
author Andy McFadden <fadden@android.com> 1275076936 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275076936 -0700

am 67e82fb1: Merge "Atomic/SMP update, part 2." into kraken