tree d9faa85362eae0ea464bb8b59afa385b41c7b53b
parent 1fbe0c761591b96511fcdb6cf0a5ce5c86e21bd0
parent 2c886953d166df8f8e50ff1b07dfc9606d04e607
author Debargha Mukherjee <debargha@google.com> 1417563144 -0800
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> 1417563144 -0800

Merge "Reinsert macro to fix issue 884."