tree 37080c5e3ef6392ef2b5e1d2d3f330f3441d981f
parent 7a1ccf7c7d1dd0defa1a82d973a8b80f3370c52c
parent 110ddef1da19c03dd5e167680d00f48e1377da9d
author Elliott Hughes <enh@google.com> 1440033208 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440033208 +0000

am 110ddef1: Merge "binder: Change from C11 <stdatomic.h> to C++11 <atomic>."

* commit '110ddef1da19c03dd5e167680d00f48e1377da9d':
  binder: Change from C11 <stdatomic.h> to C++11 <atomic>.