tree 12f5a24dab933af6d288d0c1d966280118283856
parent d93f41e891b83e7b64233b26439657c63852d10c
author Jean-Baptiste Queru <jbq@google.com> 1308421517 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1308421555 -0700

Restore code that was removed too aggressively

Change-Id: Ia1659f71e9e531c073c753a61b6ef53028749422