tree aa89940387c227bfd490caa7efe5c3cd1421c1b5
parent 1c091ba045358b6fb46014fa12c9c4b345f49265
parent 6de91158d7092e17a027fb129feec17505465925
author Todd Kennedy <toddke@google.com> 1513091660 +0000
committer android-build-merger <android-build-merger@google.com> 1513091660 +0000

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

Change-Id: I729df40376b972461908d22593b63f4f5399e356