diff options
author | Daniel Yu <dsyu@google.com> | 2016-07-15 20:09:41 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-15 20:09:41 +0000 |
commit | d5b43852dcce39d260bce2562542b3dce4c8b588 (patch) | |
tree | 16b240eeeb96a7f0ca34acbca79843e25c2cea7e /tools/aapt2/diff/Diff.cpp | |
parent | e2d148b008d18a8e8cd042fba5c394bdd1d5527f (diff) | |
parent | 344a7375d7a8a63edf2fd91b4578f25b45cd06b6 (diff) |
Merge \"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\" into nyc-dev
am: 344a7375d7
Change-Id: Ia090eda73ad984c7e15a94c9b318e3a314fe0582
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions