diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-05-27 13:54:18 -0700 |
|---|---|---|
| committer | Luis Hector Chavez <lhchavez@google.com> | 2016-05-27 13:57:13 -0700 |
| commit | 43625e411feabd7df36a8768ba8c4eca58a22e4d (patch) | |
| tree | a125cec814362b362eefa3b70bec5eef746400b9 /third_party/chromium/crypto/sha2.cc | |
| parent | 51805a169e3ac961a84d6de222b0797cfff0f919 (diff) | |
| parent | 637be7990843742d7ac6910ea909dcb09e9df175 (diff) | |
| download | libweave-43625e411feabd7df36a8768ba8c4eca58a22e4d.tar.gz | |
Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'
eed24467 Add volume trait to the test_schema device.
369d2f07 correcting volume property maximum value in if condition checking of volume trait of test_schema device.
d1f98a07 examples: remove samples with private traits
637be79 libweave: Update libchrome APIs to r395517
Change-Id: I69b312a616e67970f5cce82e7bd53a6dd266f36c
Diffstat (limited to 'third_party/chromium/crypto/sha2.cc')
| -rw-r--r-- | third_party/chromium/crypto/sha2.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/third_party/chromium/crypto/sha2.cc b/third_party/chromium/crypto/sha2.cc index 7dcef0b..1ab3fe1 100644 --- a/third_party/chromium/crypto/sha2.cc +++ b/third_party/chromium/crypto/sha2.cc @@ -7,8 +7,6 @@ #include <algorithm> #include <openssl/sha.h> -#include <base/memory/scoped_ptr.h> - namespace crypto { void SHA256HashString(const std::string& str, uint8_t* output, size_t len) { |