tree 1bbe8bab773449cc66daacccb538c41da785b3a9
parent 77bb98e878409fb714738170a2df2df1223dd57b
parent 5075e028efee577a4ff0288f56ef5db9023c8944
author Nick Kralevich <nnk@google.com> 1383783270 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383783270 -0800

am 5075e028: Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."

* commit '5075e028efee577a4ff0288f56ef5db9023c8944':
  Drop setting of in_qemu boolean and restorecon /sys/qemu_trace.