tree 9f9e399f955bc51d523a875451114dc15c279978
parent 31a12c7e1c3d6f7c792d61b9445be62490429a0d
parent 1b32ccb0313537bd0bebcb6ec3c0398e90aa103a
author Lorenzo Colitti <lorenzo@google.com> 1483685445 +0000
committer android-build-merger <android-build-merger@google.com> 1483685445 +0000

Merge "Update UID routing to upstream implementation." am: b072143d78 am: e3d477a8ad am: e6ccd07bf0
am: 1b32ccb031

Change-Id: Id0ab6bdb6ae2bd0ac3fd3fa569280c1de524bf50