tree aef7a01d59849045d71ac2f810241e067cc9c293
parent 5995cdc751060bb0296f991e8495ecb7680bc1cc
parent ff5f7a6e05293860f3eed1e7649b8344764493d8
author Jeff Sharkey <jsharkey@android.com> 1479336248 +0000
committer android-build-merger <android-build-merger@google.com> 1479336248 +0000

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

Change-Id: I1ab855b5207469c1b0d1cc7b7dd250470c0ef080