tree 9b6c21e114ecd1f9eeaffefdee81facb90fdc5e1
parent 234d122ea62a43aa3a1d6cfbf11a75e5dbe3f8e0
parent b5df7d483772d1dd08a1d5c8614f38a79e43ec12
author Andres Morales <anmorales@google.com> 1423587178 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423587178 +0000

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

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