tree cba62d0d64153aa2169651696bc238591341d679
parent ef129c27fc23a379ec04a46edfa1926e0c110e8b
parent 01880c02f5200e2faad1459fb8531dfeb5cf38cb
author Winson Chung <winsonc@google.com> 1414085563 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085563 +0000

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

* commit '01880c02f5200e2faad1459fb8531dfeb5cf38cb':