tree 6f3cd6dadaa1da1e5e3cee34fd3ea71d33c636e6
parent 8a4d5ed33580c6b89aefd927576d85f53daeeec2
parent 28bbf9b63a51d0830d3f64d16661d811bc481139
author Steven Moreland <smoreland@google.com> 1519828403 +0000
committer android-build-merger <android-build-merger@google.com> 1519828403 +0000

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

Change-Id: I7da86c04f01ef28e90239bf8379f78af89751038