tree 21fc1fe4e21a1d8eefb28068f9ec25d8f7d5b725
parent 7aec4109c53371e69bec111c69767810f45c301c
parent a58c03f603cd90d1fed5566c88af5cd6c6f4caf5
author Christopher Tate <ctate@android.com> 1393539159 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393539159 +0000

am a58c03f6: am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"

* commit 'a58c03f603cd90d1fed5566c88af5cd6c6f4caf5':
  Fixed upgrading from forward-lock application to system application