tree f246f30951a48ea0cbb1afebd28bdd3e51be6710
parent 898fa718a939714970918a3c96fadd1be1da0db7
parent a97b0712d81f3623b8ae3e636c0b5e8247e009b0
author Tianjie Xu <xunchang@google.com> 1490593227 +0000
committer android-build-merger <android-build-merger@google.com> 1490593227 +0000

Merge "Skip logging the warning for uncrypt_status for devices w/o /cache" am: df0619edea  -s ours
am: a97b0712d8  -s ours

Change-Id: I94338224aa3f9b7b88518527f14dd51f7ce62b22