tree 210b9c4879315ce41089b7f1dd3db705bf628297
parent bbb721d71f4b283ee9f144368ea82e33b75afe2b
parent 30ec992a62b592040b7351163fb296776b979745
author Elliott Hughes <enh@google.com> 1517885375 +0000
committer android-build-merger <android-build-merger@google.com> 1517885375 +0000

Merge "Rewrite getentropy." am: a325151da0
am: 30ec992a62

Change-Id: I96adeca12637cccce761c4859bd7a983be7a55c9