tree 273604e8ac827e699eeba928ee921af9b786b283
parent d2b83645a27e50308a067b841a2b00539031e7a0
parent 51bdaee264b4a25fcf3f8ac56160e599ce122361
author Zhuoyao Zhang <zhuoyao@google.com> 1509640142 +0000
committer android-build-merger <android-build-merger@google.com> 1509640142 +0000

Take version into consideration in GetServiceName
am: 51bdaee264

Change-Id: Id47d92eb7bd0b73536d31bcc6c75aa31e2849769