tree cf9dcfafc6a02b46356defba921f5a17dae39a16
parent b998054f50043c23e8599ee3cfae058ac378c5cb
parent 085a0ce75666d6e4281c7a74b690a4bd7d142c8d
author Andres Morales <anmorales@google.com> 1423521956 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1423521957 +0000

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