tree e84fd5e0471cdf9a5714d4d14a5f2882e838ec73
parent b0845b736614d0d58ed288bdc77e66d3b3b96866
author Jean-Baptiste Queru <jbq@google.com> 1282180122 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1282180122 -0700

DO NOT MERGE - reconcile open-source variant

Change-Id: Ib8297477936d8d6d6515f38813887f75a663a7f1