tree 1677243f611d9d390e1ad93cc49343cc8963214b
parent 801f887b315afc3c1fae68229566aeca3e1ef58e
parent 26d680b5edde00120726a05c204e97ddef3d246a
author Elliott Hughes <enh@google.com> 1416524983 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416524983 +0000

am 26d680b5: Merge "Remove generic/x86 no-op."

* commit '26d680b5edde00120726a05c204e97ddef3d246a':
  Remove generic/x86 no-op.