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