tree 69728a629aa8646c0392f53111d81442d30ac9e6
parent ecce539f3d739fbf4b395639a485fddf51f688d6
author Robert Ly <robertly@google.com> 1308763452 -0700
committer Robert Ly <robertly@google.com> 1308771842 -0700

cherrypick from hc-mr1 Change-Id: I7553282b2f3268672f79d9d75d63ce23bcdf1bf5

Change-Id: Ib47cf367f5c9ca66da2921fa86078693198a7968