tree 9395663273bfe921a001c0657d03ce7378025fe7
parent 061ece161d51bf81b8dea9e49b5f6dbb74a2936d
author Mathieu Chartier <mathieuc@google.com> 1400719705 -0700
committer Mathieu Chartier <mathieuc@google.com> 1400719767 -0700

Fix build.

Old Atomic things were rebased over.

Change-Id: I437041af3247c316f2a75f5ef4bd35286fc8e2b1