tree 10da860fcff71886af91d082e31f0e1917926848
parent c9433370beb8fbe1e0a3d089de16332edc8507ad
parent dcb02a7b6c9f88c34852eaaee544433b7572ca4d
author Winson Chung <winsonc@google.com> 1414566459 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566459 +0000

am dcb02a7b: 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 'dcb02a7b6c9f88c34852eaaee544433b7572ca4d':