OSDN Git Service

Merge "Revert "Update getentropy_linux.c from upstream."" am: 9f798246ba
authorJosh Gao <jmgao@google.com>
Fri, 2 Sep 2016 08:52:05 +0000 (08:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Sep 2016 08:52:05 +0000 (08:52 +0000)
commitd644eda3265e49d927aa2ca213c3e559dbbc296f
tree0e91486165e6c1cba69ba478597cb9320389ba55
parent481cdc2a57b9c3e83d691fc9a790c3c9b40d9df6
parent1e424c58103276959bcc796a8c388e287ae45c99
Merge "Revert "Update getentropy_linux.c from upstream."" am: 9f798246ba
am: 1e424c5810

Change-Id: I53c276cf644bc87344eaa51c79c10fa016e17d60