tree 28cb7dea1b416944de19c79442f9f2514eff960e
parent 04561a55df693e7bd8d3047ccc4fbef504ac07cf
author Daisuke Miyakawa <dmiyakawa@google.com> 1243238104 +0900
committer Daisuke Miyakawa <dmiyakawa@google.com> 1243238104 +0900

Manual merge from cupcake_dcm.