tree 1c50a9b22e9c245ee4dbf9941c16ab2fadc8f350
parent 2d4a27ee6cbd779b17eb8cd07dcbb9ff3bc8b2c0
parent c80e876cd2eab6452313a98c6ddeca403510784c
author Nick Kralevich <nnk@google.com> 1402607017 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402607017 +0000

am c80e876c: Merge "Add service_contexts to embedded.mk."

* commit 'c80e876cd2eab6452313a98c6ddeca403510784c':
  Add service_contexts to embedded.mk.