tree 5397c66f76c34a1623fe527dc61e166d25d17010
parent e7644a022c104c960c98883435dc727a273c2d91
parent e3469a426e1a46cdc439d526d28748950bdbb2b6
author Rubin Xu <rubinxu@google.com> 1504788958 +0000
committer android-build-merger <android-build-merger@google.com> 1504788958 +0000

Merge "Always add local subnet routes to the interface's routing table" am: 981228be38 am: 5fb26a1270
am: e3469a426e

Change-Id: I21f4231c968b37cdcf1565279eedfb990dbc583b