tree 3f8a23fcc411803f7d3712a325fd8d5c01162b34
parent b0161d461cb8ad3e2c2ca04ec56b6dc0a91c9f3c
parent b0cac388e4f9dee9bc267b37cc983f52211c717b
author Lorenzo Colitti <lorenzo@google.com> 1538376445 -0700
committer android-build-merger <android-build-merger@google.com> 1538376445 -0700

Merge "Make requestRouteToHost a no-op for system callers." am: f1bcfb6014 am: 07012857ae
am: b0cac388e4

Change-Id: I2999208487c2c15d7e158e690cf7a2ac4e7c3e6d