tree 4a0a0d7360dc5bddae8f88a1e93905d456eec5f8
parent f55c5a52ac3d523cdcfb7cd7ab093d01da8b3caf
author Andres Morales <anmorales@google.com> 1430970262 -0700
committer Andres Morales <anmorales@google.com> 1431121576 -0700

[versionitis] pull image id from recovery into props

- remove root/build.prop, merge with root/default.prop

Change-Id: I913c67d948678745c0bb1b614ac10a0b7488e5c4