tree 2f9a43b7b3f8df2dfbb583bb1be38860973ddb62
parent 579ca37361b2b1ea9aa62d6b450866e1f48db064
parent df2f5a07aecac7be4ac2d1100668a0396fd256e7
author Carl Shapiro <cshapiro@google.com> 1285720683 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285720683 -0700

am df2f5a07: am d55f0adf: Qualify the source argument of atomic loads as a const pointer.

Merge commit 'df2f5a07aecac7be4ac2d1100668a0396fd256e7'

* commit 'df2f5a07aecac7be4ac2d1100668a0396fd256e7':
  Qualify the source argument of atomic loads as a const pointer.