tree f77428a5d8790c7ff910dfbe927f7242a9701f0a
parent bd51a0d30dd7a5a7873d07ff5177ed3ec3269278
parent a4f66b6623ca5afe4d2b3c36d2b7d0a9555ee11f
author Jeff Sharkey <jsharkey@android.com> 1479334949 +0000
committer android-build-merger <android-build-merger@google.com> 1479334949 +0000

Merge "Only restorecon CE storage after unlocked." am: cfd12251bd
am: a4f66b6623

Change-Id: Ibfcd9cd102fd6cf46f795865a1dc3259471eff78