tree dda097ae16a1ca99b1c810178514e61c6cf110a0
parent e19ebfee3cede975d0dce0b0badf1251c44ec453
parent 240cd127eb0a14515b37b2e691645a1e83ab31f9
author Nick Kralevich <nnk@google.com> 1383782526 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383782526 -0800

am 240cd127: Merge "Move goldfish-specific policy rules to their own directory."

* commit '240cd127eb0a14515b37b2e691645a1e83ab31f9':
  Move goldfish-specific policy rules to their own directory.