tree 652283c8b10ccc11abb321077773bdfbf221da8e
parent 1c762d8309cb70659c6a8e43c214c3578b28a193
parent 5807a85f7cb633d517c910245cf3e5b601a740f4
author Jiwen 'Steve' Cai <jwcai@google.com> 1503452482 +0000
committer android-build-merger <android-build-merger@google.com> 1503452482 +0000

Merge "Rename servicetool to pdx_tool" into oc-mr1-dev
am: 5807a85f7c

Change-Id: I1da3bc208c05aeda98abe1d54ad98763be701ef1