tree 210b9c4879315ce41089b7f1dd3db705bf628297
parent 6c30932089dfefe5d01862af70dde3bbea9a0414
parent a325151da0dec4d488a9e1cc93a29a561dd00578
author Elliott Hughes <enh@google.com> 1517883696 +0000
committer android-build-merger <android-build-merger@google.com> 1517883696 +0000

Merge "Rewrite getentropy."
am: a325151da0

Change-Id: I0d105025784eac0fc993cd34c0c294f9e33f5ac3