tree 596886f9d74d86cc053e0b2dea583f828e3b859a
parent 5a55c1196ce26df4b569bdf197c3a39d7a078c05
parent 1620c671f2b946333958d07420643caf98534a01
author Geremy Condra <gcondra@google.com> 1364324288 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364324288 -0700

am 1620c671: Merge "Introduce security labels for 2 new device nodes."

* commit '1620c671f2b946333958d07420643caf98534a01':
  Introduce security labels for 2 new device nodes.