tree 36b5af49c35be12bd13589f68e09e95dfd4535ee
parent 3b39d7503f4ce75dce962445dddfbfb18f6babf0
parent be8d2b054e81e10c944efa2040fc2a13dce2b070
author Paul Wilkins <paulwilkins@google.com> 1396618240 -0700
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> 1396618240 -0700

Merge "Reinstating the DISABLE_RC_LONG_TERM_MEM macro"