Merge "Adding get_entropy_context function."
authorDmitry Kovalev <dkovalev@google.com>
Wed, 28 Aug 2013 00:02:36 +0000 (17:02 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 28 Aug 2013 00:02:36 +0000 (17:02 -0700)

Trivial merge