tree a4dd4d25f6fe70857901c6ea73529f03f813b2e7
parent 8d7f5fc78d998bfe3c68e56d5f1548e8b2129472
parent 57b65f10aaafc4bf42a0fa59eb2bbe6c8371c2e6
author Jeff Sharkey <jsharkey@android.com> 1347472376 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347472376 -0700

am 57b65f10: Leave trigger intact during upgrade.

* commit '57b65f10aaafc4bf42a0fa59eb2bbe6c8371c2e6':
  Leave trigger intact during upgrade.