tree d60300a99b2a299c6a078c815ccbba8d9c35b389
parent 820e63e1e69b493368ccb083af7362f372c49ee4
parent e078c5e5f609e3441212c6b00e038fc014cc6daa
author Elliott Hughes <enh@google.com> 1463527057 +0000
committer android-build-merger <android-build-merger@google.com> 1463527057 +0000

Merge "scrypt doesn\'t need <machine/cpu-features.h>." am: e6e09c358c am: 3608597959 am: 540c0274be
am: e078c5e5f6

* commit 'e078c5e5f609e3441212c6b00e038fc014cc6daa':
  scrypt doesn't need <machine/cpu-features.h>.

Change-Id: I3c54d96e44eccd15413831bdaef63a879d6d8dd6