tree 2922556f73b653125f47a16b3351f5324e532763
parent b0fbfcea05827223ab7260ad5e2c8e4ba3bf0cd9
parent 3175c621da50f3596a6daaf42906887e00f81a3e
author Todd Kennedy <toddke@google.com> 1513094059 +0000
committer android-build-merger <android-build-merger@google.com> 1513094059 +0000

Merge "Block the upgrade of persistent apps" am: 0b30d95dc8 am: 6de91158d7
am: 3175c621da

Change-Id: I5319cc775e7381e697ae365cdf7433d4bfdf56bd