tree f8729affc8a3ad246330da8d339c24116085bc80
parent 619e4dca8e9dfe4daa0754b0568a7590788cd50e
parent fc92eb94c413ebae1016d10460ee62e92f0c1a64
author Adam Powell <adamp@android.com> 1343679202 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343679202 -0700

am fc92eb94: am 2ffb1acb: Merge " Fix preload classname for phone policy."

* commit 'fc92eb94c413ebae1016d10460ee62e92f0c1a64':
  Fix preload classname for phone policy.