OSDN Git Service

am 224c60c3: am da5d54c8: am dfabbc68: Merge "Add policy for x86 emulator."
authorNick Kralevich <nnk@google.com>
Fri, 20 Dec 2013 21:11:15 +0000 (21:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Dec 2013 21:11:15 +0000 (21:11 +0000)
* commit '224c60c337490e095d402e63961bdc8ae9ebd70c':
  Add policy for x86 emulator.


Trivial merge