summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-07-07 17:28:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-07 17:29:00 +0000
commit8104616696ac5e806b16a393ea02c4f5d8efc328 (patch)
tree7d80a4889001e1a9bb00a3dab9a57fde49d62cc0 /include
parent833f142d201a4b682885ff9d95c6b3ab32fd0618 (diff)
parent437bc5dceca1608456c1c40b694645bc2d100ad4 (diff)
downloadsystem_core-8104616696ac5e806b16a393ea02c4f5d8efc328.zip
system_core-8104616696ac5e806b16a393ea02c4f5d8efc328.tar.gz
system_core-8104616696ac5e806b16a393ea02c4f5d8efc328.tar.bz2
Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions