tree 8a0e67ef8cc1150f2a3057a894ea7ba727196657
parent fb44c2350200ac928d2dd8de5213d64cfdf53b38
parent 46d81e4f5628af87db17fd8704cd06d771e59b4a
author Jeff Sharkey <jsharkey@android.com> 1468857994 +0000
committer android-build-merger <android-build-merger@google.com> 1468857994 +0000

Merge \"Only restorecon CE storage after unlocked.\" into nyc-mr1-dev
am: 96f387e8c0

Change-Id: I3a1c31334d32e7bdff8e05558356d2833fcfb831