OSDN Git Service

Merge "Revert "Update getentropy_linux.c from upstream."" am: 9f798246ba am: 1e424c58...
authorJosh Gao <jmgao@google.com>
Fri, 2 Sep 2016 08:58:35 +0000 (08:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Sep 2016 08:58:35 +0000 (08:58 +0000)
commit828c006a171845db03782f217ae1908b361afcc4
treee21004002529af7954d08cf2b73f342373c0a04e
parentbbfadc074af6984262e5aad4e35239dd48c47d7c
parent2f473a56e646e62b15ce71d0eb56ed55704ccebf
Merge "Revert "Update getentropy_linux.c from upstream."" am: 9f798246ba am: 1e424c5810 am: d644eda326
am: 2f473a56e6

Change-Id: I287e6ee3b30eb8ccb32ee6b97555ac7037e81cb4