tree 0ab762edf753254924134c38ac6995b121e0bca6
parent 96151d642eaa17dadde4921317f3f9a6781cfaa3
parent d579b350e2d2083686678b1c5746846241222f4c
author Robert Greenwalt <rgreenwalt@google.com> 1402592023 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402592023 +0000

am fe5ca964: (-s ours) Merge "Fix public API of LinkProperties." into lmp-preview-dev

* commit 'fe5ca9646f86e041ed7729ecd0a006428806acf2':
  Fix public API of LinkProperties.