tree ca59dcb5799437d0980ea519d374677c68e2d54f
parent 38f81ccc768958b1a9100cb2caa93ec3aedd9b5e
parent 1e995c76485f8a7477177886890b834c31e8d1a6
author Christopher Tate <ctate@google.com> 1393980854 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393980854 +0000

am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev

* commit '1e995c76485f8a7477177886890b834c31e8d1a6':
  Update PackageMonitor to recognize new 'replacing' semantics