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