tree c8750497aed5e07242cd2ce0e4361b2b04a79b39
parent 3f6239e37e1eff1e42e0a595ffd4d30d1876a9ea
parent 263c4788dcf45f104f8668fd6621d1a7c39689b9
author Lorenzo Colitti <lorenzo@google.com> 1386614084 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386614084 +0000

am 263c4788: am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress."

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