| commit | 36085979592293853cb18fadb61358f5b7f4f717 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 17 22:58:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 17 22:58:04 2016 +0000 |
| tree | d60300a99b2a299c6a078c815ccbba8d9c35b389 | |
| parent | 820e63e1e69b493368ccb083af7362f372c49ee4 [diff] | |
| parent | e6e09c358c249191cf3afa0e44db95b45ea332c4 [diff] |
Merge "scrypt doesn\'t need <machine/cpu-features.h>." am: e6e09c358c * commit 'e6e09c358c249191cf3afa0e44db95b45ea332c4': scrypt doesn't need <machine/cpu-features.h>. Change-Id: Ia87611af260d74930786c044475da06928ab5d6b