tree 6f3cd6dadaa1da1e5e3cee34fd3ea71d33c636e6
parent 3c6f37fa61588222e9b734ef8c2066b36dd9ac6f
parent e3ccf5c0e6ccc67c9c20ec9e90ac40228e26f315
author Steven Moreland <smoreland@google.com> 1519829075 +0000
committer android-build-merger <android-build-merger@google.com> 1519829075 +0000

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

Change-Id: I742e0b5414b598e9ded5ca4920b6b550ebbf831e