tree d7efd77fbef8fce2405a052206521f6ccec5a6a6
parent cc32a792c07219e3078a7703200d740f0ab7431e
parent 669f679243431084adaaacd6e4857e2eed92b93a
author Geremy Condra <gcondra@google.com> 1363733035 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363733035 -0700

am 669f6792: Merge "mediaserver.te refactor"

* commit '669f679243431084adaaacd6e4857e2eed92b93a':
  mediaserver.te refactor