tree 6ddc44374e07e16d94c1338ea8b9c4f6b206f73f
parent 437d02d389711487a29662455b52a601053d9749
parent 8c4115617833e83253a53fe855ea96bdb39fbe1d
author Sander Alewijnse <salewijnse@google.com> 1415960795 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415960798 +0000

Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev