tree bd0725018d01a52d7b6cc2b5dbfb44e1e4e98320
parent 11e5ff75af866f91622b6008fa13db1c3685ae69
parent 47d776d2777622c121297dcc4c59057b4f5ad3e0
author Steven Moreland <smoreland@google.com> 1519823026 +0000
committer android-build-merger <android-build-merger@google.com> 1519823026 +0000

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

Change-Id: I5a2d00d8ec556d9cf2030e06a733347522b69759