tree 8eb1047747afad0119a1144882ac98318d6047b4
parent 68b98bc608d3562751bf1a7fc765cce6d8e4befa
parent 002031a5405fda9ea2b38fe30aa02d839105d297
author Dan Yu <dsyu@google.com> 1468612796 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468612797 +0000

Merge "docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5" into nyc-dev