tree 6f3cd6dadaa1da1e5e3cee34fd3ea71d33c636e6
parent c8514ef019dfb1cd0611cbfc029b43e12a5c0d64
parent 7270dc01ca7a75b5c36fdc4fd09ca5ce9fabe27e
author Steven Moreland <smoreland@google.com> 1519828741 +0000
committer android-build-merger <android-build-merger@google.com> 1519828741 +0000

Merge "Don't use cutils/Atomic.h" am: 28bbf9b63a
am: 7270dc01ca

Change-Id: Ia7e4376604919d925de34942395967cf9a2bb770