tree 96f042c5efd1667b326065c0b348215ca43e633f
parent 67ceaf3e83d29ca69708a3ae94f5e7797bef4ca6
parent 9c711282ad234e104c34eb4408d85fc1bb149ded
author Kenny Root <kroot@google.com> 1316656612 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316656612 -0700

am 9c711282: Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom

* commit '9c711282ad234e104c34eb4408d85fc1bb149ded':
  Unhide new PackageManager APIs for API 14