tree 8a0e67ef8cc1150f2a3057a894ea7ba727196657
parent 2722208dd8b7ffaf6e15edea30d4d206a8b56ba2
parent 96f387e8c02bdfcd5ed53684b5563c208770f7ee
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