tree 8ebb93fc18b68a3dcc0b4fbfa780253191f40dd8
parent bb14cc4ef6a5e54bf9ee7fc0cdc830144836bce2
parent b2908e61881cddaff061b904bafddd962337ba70
author Robert Ginda <rginda@google.com> 1440184288 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1440184288 +0000

Merge "Change 'service_name' to 'service_type'"