tree d93222d37b640aebf25b3eea3abf20dcbf9ff8c5
parent 1db584b899dffca884c3842c07da189f7c9af470
parent 65dd88beccc571315ffc5d9cce90402d0426a28b
author Colin Cross <ccross@android.com> 1390523219 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1390523219 +0000

Merge changes Ib13d9654,I98723ccd

* changes:
  system/core: remove $(KERNEL_HEADERS) from includes
  libcutils: fix atomic_memory_store_barrier