tree 55defa4d6aa2bb8ab73174fe8dc9541dc516c65f
parent 8380cedda2361e159fc7f91045769fbe5df83b20
parent f049f56b70d48e0f43e2ff829a262245add5f208
author Lorenzo Colitti <lorenzo@google.com> 1408477073 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408477073 +0000

am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev

* commit '45b565ffdbd2962c336f385d80d6516cd1cc489a':
  Stop using LinkProperties for static configuration.