tree ce1c07a7672b952d88fa82889619a08ebe3359f5
parent f33c3ef9332c2d3e4a04b14819aa3dbb9f0d4d21
parent 5f2b36f8547f9f6a3cec430c9f3f8ec44601ce72
author Andy McFadden <fadden@android.com> 1275511571 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1275511571 -0700

Merge "Atomic/SMP update." into kraken