tree c2b0e3f0e3487ba690f77e6bea71dd98040d44f9
parent 1888ab842a4308c3898beec434ac59bcda12617b
parent b998054f50043c23e8599ee3cfae058ac378c5cb
author Andres Morales <anmorales@google.com> 1423246992 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423246992 +0000

am b998054f: Merge "Add system/build.prop dependency on vendor/bootimg"

* commit 'b998054f50043c23e8599ee3cfae058ac378c5cb':
  Add system/build.prop dependency on vendor/bootimg