tree 38979688ed8588859b98c2eb83f10b01be81ebff
parent bd79652a9afeee1e81f0f51d11e5869091f58af9
parent a6c59158761423551941f6ed338a117658e581ad
author Christopher Tate <ctate@google.com> 1393981250 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393981250 +0000

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

* commit 'a6c59158761423551941f6ed338a117658e581ad':
  Update PackageMonitor to recognize new 'replacing' semantics