tree 970aaa7f5876295b13d89623d3265eda1655a359
parent 71c2640ac0c59a76f24805ee0b988f63281d110c
parent f058440b3b1dd2b0fd700e60948f7bb723f696ed
author LongPing Wei <weilongping@huawei.com> 1548866742 -0800
committer android-build-merger <android-build-merger@google.com> 1548866742 -0800

Merge "Remove secontext.h, secontext.cpp, hash.h" am: eb00112e09
am: f058440b3b

Change-Id: I339fb6d110cc76ae7bc650736f94880789b0d5a4