tree 03758c72035f5800ab56ded07490c048b05a14ec
parent c6a9b5564a066164ea9e09616fd45f1e94d305b0
parent bef2c91bb5efdfc7d480389df9e9b9556a218600
author Lorenzo Colitti <lorenzo@google.com> 1503384139 +0000
committer android-build-merger <android-build-merger@google.com> 1503384139 +0000

Merge "Fix transitioning between non-accept strict policies."
am: bef2c91bb5

Change-Id: Iacf9f43f88ac77cb2a6094348cf52107f7ef0817