am eae211ba: am b919da4c: Merge "Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk."

* commit 'eae211ba7b709716833e2f10421e0e6e1bd53926':
  Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk.
This commit is contained in:
Elliott Hughes 2014-12-04 16:17:17 +00:00 committed by Android Git Automerger
commit 54d67bfce4