tree 4c164e396f822b24fd8b8457e3ffe3784439d646
parent 3584355bb9eae99a8de209956317798669394aa5
parent c85364c9c91961461a6d81a37c8b30b34b02383b
author Nick Kralevich <nnk@google.com> 1439424036 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439424036 +0000

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

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