tree 5c319993c8c96de6babed71c2fea7ed043131450
parent 35e36de659a20e92fe871193cf3048e0bdc82696
parent b4ccc5407932858e9e4cdc29dafe05e810e35f22
author Lorenzo Colitti <lorenzo@google.com> 1386613699 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386613699 -0800

am b4ccc540: Merge "Add address flags and scope to LinkAddress."

* commit 'b4ccc5407932858e9e4cdc29dafe05e810e35f22':
  Add address flags and scope to LinkAddress.