am e4b8ba35: am 5ffee768: Merge "Set up rules to build oem.img"

* commit 'e4b8ba351d3a077d6ed9c0f21fd6ad6b02198d21':
This commit is contained in:
Jeff Sharkey 2014-05-12 23:30:45 +00:00 committed by Android Git Automerger
commit e0156ab836

Diff content is not available