tree 1515f324376354f6aec913e2da1d5f49b080fceb
parent 291232aea7130c96a87ca52df0eb1e0e742b1826
parent 5f79bcdd070f4069cd60bbe68430ee172575f9e2
author Nick Kralevich <nnk@google.com> 1439423630 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439423630 +0000

am 5f79bcdd: Merge changes from topic \'file_contexts.bin\'

* commit '5f79bcdd070f4069cd60bbe68430ee172575f9e2':
  build: switch over to file_contexts.bin only
  Update embedded.mk to support file_contexts.bin