tree 72db4bfc6ea23bfef4610e9a3209238e84db1436
parent 0dd913994cc029847c56f73a763f77457e748d49
parent 49209a36958218c6f51bb9a8e603a69e496481f0
author Andy Hung <hunga@google.com> 1481747663 +0000
committer android-build-merger <android-build-merger@google.com> 1481747663 +0000

Merge "APM::updateCallRouting: ignore for stub output hal" into cw-f-dev
am: 49209a3695

Change-Id: Icd5b0e92cd4a21ececfa00e32d8f8d985aa94a79