tree 381e266c2550986a006e2d078af9f94dccf84441
parent f9ad70a472bfab4d3769cb6eece06dac8de9e3bd
parent 224c60c337490e095d402e63961bdc8ae9ebd70c
author Nick Kralevich <nnk@google.com> 1387573875 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387573875 +0000

am 224c60c3: am da5d54c8: am dfabbc68: Merge "Add policy for x86 emulator."

* commit '224c60c337490e095d402e63961bdc8ae9ebd70c':
  Add policy for x86 emulator.