tree e00bab27ef1a8034e6a4daa59b02d2aaa7490178
parent ca53f0a0840ef859dbabfb089f2036656d1ca18c
parent 5bd11b48875846b304e782afc537b4b4b8a6eb39
author Colin Cross <ccross@android.com> 1390523493 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390523493 -0800

am 5bd11b48: Merge changes Ib13d9654,I98723ccd

* commit '5bd11b48875846b304e782afc537b4b4b8a6eb39':
  system/core: remove $(KERNEL_HEADERS) from includes
  libcutils: fix atomic_memory_store_barrier