tree 43427adc734097721c556bf2a134c59a2f8b4fb8
parent ba96de5f65101e8aa04f36c028551dcf08211eae
parent ac252357bb15cdeb7d4637a1cfeaa76810514715
author Elliott Hughes <enh@google.com> 1416266204 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416266204 +0000

am ac252357: Merge "Remove atomic-inline.h."

* commit 'ac252357bb15cdeb7d4637a1cfeaa76810514715':
  Remove atomic-inline.h.