tree 9fae42a1a795b1917994dc82e222679f03e0020d
parent b615aa2c8f9c83361e59c8f88c0f893680f417ff
parent 94d92d94866d3dc1c1ba5c9dff651ceb419f65cd
author Patrick Tjin <pattjin@google.com> 1429241420 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429241420 +0000

am 94d92d94: (-s ours) am 479e42ba: bootstub: only build for moorefield, merrifield [DO NOT MERGE]

* commit '94d92d94866d3dc1c1ba5c9dff651ceb419f65cd':
  bootstub: only build for moorefield, merrifield [DO NOT MERGE]