tree 6aeb840ee110c3fa3dad4aa619ccefcfc4e1e5be
parent 425941d0c20dd242dfb939407e9e95247a19946b
parent 29a86c267b890a506c12d1ffadb8db2baaa2e20e
author Winson Chung <winsonc@google.com> 1392411291 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411291 +0000

am 29a86c26: am 872e70e0: Merge "Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)" into jb-ub-now-kermit

* commit '29a86c267b890a506c12d1ffadb8db2baaa2e20e':
  Accounting for new Package event extras when updating forward-locked apps. (Bug 11855584)