diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 20:59:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 20:59:59 +0000 |
| commit | 26d92768d6dac505903c96e842673ee9a57a0989 (patch) | |
| tree | 38df9f9d8033816ce7a379e2aa571d1c2e249d66 /media/libmedia | |
| parent | d86450b93ab3960ccd68aed14563aaa76b43ce9b (diff) | |
| parent | 34c55e3ec5d4f6fdc2313ce904fb95b9ccdf9d72 (diff) | |
| download | frameworks_av-26d92768d6dac505903c96e842673ee9a57a0989.zip frameworks_av-26d92768d6dac505903c96e842673ee9a57a0989.tar.gz frameworks_av-26d92768d6dac505903c96e842673ee9a57a0989.tar.bz2 | |
am 34c55e3e: Merge "No need to #include atomic-inline.h if you have atomic.h."
* commit '34c55e3ec5d4f6fdc2313ce904fb95b9ccdf9d72':
No need to #include atomic-inline.h if you have atomic.h.
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/SingleStateQueue.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libmedia/SingleStateQueue.cpp b/media/libmedia/SingleStateQueue.cpp index 3503baa..c241184 100644 --- a/media/libmedia/SingleStateQueue.cpp +++ b/media/libmedia/SingleStateQueue.cpp @@ -16,7 +16,6 @@ #include <new> #include <cutils/atomic.h> -#include <cutils/atomic-inline.h> // for android_memory_barrier() #include <media/SingleStateQueue.h> namespace android { |