Synced repos to: 187640

Change-Id: I707d764fa67758c45996f3e81f9081d82b9b111e
Reviewed-on: https://gerrit.chromium.org/gerrit/22963
Reviewed-by: Han Shen <shenhan@google.com>
Tested-by: Han Shen <shenhan@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Han Shen <shenhan@google.com>
2 files changed