am 89a87488: am b5df7d48: Merge "Add version strings from android-info.txt into build.prop"

* commit '89a87488db537eb6c78e6cd5d58ef32fcadc523d':
  Add version strings from android-info.txt into build.prop