tree cc93df1eadf625e725c78cf12a284725ce9a17d9
parent b38934179ceb85565db3b7892201ac3dd8d66ddd
parent 35f39b66606928b2fea06ebaa091a479bc28844a
author Lorenzo Colitti <lorenzo@google.com> 1408476551 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408476551 +0000

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

* commit '14152c7994d690a5ee0a0aad19701557407a4d70':
  Stop using LinkProperties for static configuration.