Merge "Adds spatial-svc macros to code to allow disabling"
authorDeb Mukherjee <debargha@google.com>
Sun, 10 Aug 2014 17:08:42 +0000 (10:08 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Sun, 10 Aug 2014 17:08:42 +0000 (10:08 -0700)

Trivial merge