tree bd0725018d01a52d7b6cc2b5dbfb44e1e4e98320
parent 11e5ff75af866f91622b6008fa13db1c3685ae69
parent 6867db29809c352477531cd7c439316d33ed5465
author Steven Moreland <smoreland@google.com> 1519822544 +0000
committer android-build-merger <android-build-merger@google.com> 1519822544 +0000

Merge "Don't use cutils/Atomic.h" am: 9355446812
am: 6867db2980

Change-Id: Ia55205f8373e5a27e915f30a4501e1808b351195