am 5d7f3c6d: am 491055df: Merge "Import OEM build properties, if defined."

* commit '5d7f3c6d60ae316ab8a7767dc51d22bc231e5b47':
This commit is contained in:
Jeff Sharkey 2014-05-12 23:29:57 +00:00 committed by Android Git Automerger
commit 3fd3963b79

Diff content is not available