tree 892b8cbc3dd92895e4a80ab8162079ab325b3a3a
parent 536817e165370e7f9b451685fd52aa454482849a
parent 45a8630b136fbac6125ca50e5423eda9b4b7cafd
author Sreeram Ramachandran <sreeram@google.com> 1401485949 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401485949 +0000

am 5a734bd7: Merge "Support legacy routes added by apps via ensureRouteToHost()." into lmp-preview-dev

* commit '5a734bd78e83afeee5833b56f04ac99113b97542':
  Support legacy routes added by apps via ensureRouteToHost().