tree 222fb10cca9160843891fc1ec447a8f6722db64a
parent 36c4eb188c6594db877bd7b9f46c55264180dc3f
parent 261e9d08dbf1cd7fea7e1799338238d11d18cb7c
author Elliott Hughes <enh@google.com> 1358470269 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358470269 -0800

am 261e9d08: am e4ca88d9: Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."

* commit '261e9d08dbf1cd7fea7e1799338238d11d18cb7c':
  Add functionlity to the scripts to replace tokens in kernel headers based on architecture.