Commits · 9d32e4c13719a78eba7c8221b1721d60759d7622 · Linshizhi / Chromium_Depot_tools

30 Jan, 2017 1 commit

Roll recipe dependencies (trivial). · 9d32e4c1

recipe-roller authored Jan 30, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/30a672d26b45289947783932d8062fc70dfb1611 Make it possible to override more than one package (phajdan.jr@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2664843003

9d32e4c1

29 Jan, 2017 1 commit

Follow up on Gerrit git cl status: do not treat CQ comment as reviewer reply. · 7afd1646

Andrii Shyshkalov authored Jan 29, 2017

TBR=sergiyb@chromium.org,agable@chromium.org
BUG=

Change-Id: I37f02556f254fbdc78ab30e990a7cc6d05120038
Reviewed-on: https://chromium-review.googlesource.com/434477Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

7afd1646

27 Jan, 2017 3 commits

Gerrit git cl status: do not treat CQ comment as reviewer reply. · 33e88a4e

Andrii Shyshkalov authored Jan 27, 2017

R=sergiyb@chromium.org,agable@chromium.org
BUG=

Change-Id: I7684923c19fe7441cdd52b7707c28f01c95a4ba4
Reviewed-on: https://chromium-review.googlesource.com/433699
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>

33e88a4e

Roll recipe dependencies (trivial). · fe637498

recipe-roller authored Jan 27, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/b120624b72ec851b0d9f2accccf58e525555be25 step: make all args to __call__ explicit (phajdan.jr@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2656133003

fe637498

Roll recipe dependencies (trivial). · a732e984

recipe-roller authored Jan 27, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/bbcf1dc6436d1f89ffd35fe3354b9ee7701e272a Whitelisting python's copy module for recipes. (robertocn@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2660583002

a732e984

26 Jan, 2017 5 commits

git cl try: reduce number of RPCs to Gerrit from 3 to 1. · eadad92e

Andrii Shyshkalov authored Jan 26, 2017

R=agable@chromium.org
BUG=681704

Change-Id: I3c0ab781e0357e0855d50157c5653df57f68ac9a
Reviewed-on: https://chromium-review.googlesource.com/432336Reviewed-by: Aaron Gable <agable@chromium.org>

eadad92e

git cl: reduce number of Gerrit RPCs in status check. · 8039be7c

Andrii Shyshkalov authored Jan 26, 2017

Also fixes git cl description <url> by propagating codereview host information
in all cases.

BUG=681704
R=agable@chromium.org

Change-Id: Ia79c10b19d72b5a8797a1428ad8a79c8f4480901
Reviewed-on: https://chromium-review.googlesource.com/431036Reviewed-by: Aaron Gable <agable@chromium.org>

8039be7c

git cl: refactor tests to account for Gerrit GetChangeDetail RPCs. · 8fc0c1d8

Andrii Shyshkalov authored Jan 26, 2017

BUG=681704

Change-Id: I7c8fd09f3c19b9facf876ebeef853e5d77b72a9c
Reviewed-on: https://chromium-review.googlesource.com/432316Reviewed-by: Aaron Gable <agable@chromium.org>

8fc0c1d8

Fix git cl upload --dependencies for Gerrit. · 1090fd5b

Andrii Shyshkalov authored Jan 26, 2017

BUG=640299
R=rmistry@chromium.org,agable@chromium.org

Change-Id: Iac987758065c57a4a08ce98f838fc0c30a8c1a02
Reviewed-on: https://chromium-review.googlesource.com/432676
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

1090fd5b

Fix git-crrev-parse returning reverted commits instead of original commits · 056bef20

Jeff Carpenter authored Jan 25, 2017

Also delete extraneous whitespace

BUG=685326

Change-Id: If7f68346fd27edf9a5dca315cfcfbca0decc2da6
Reviewed-on: https://chromium-review.googlesource.com/433158Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@chromium.org>

056bef20

25 Jan, 2017 9 commits

Remove stip@ from OWNERS. · 8adfedcf

Mike Stipicevic authored Jan 25, 2017

Change-Id: Id841c4720996ca3568cec8a5721469c34f00cf77
Reviewed-on: https://chromium-review.googlesource.com/431803
Commit-Queue: Mike Stipicevic <stip@chromium.org>
Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>

8adfedcf

Roll recipe dependencies (trivial). · 5c34046d

recipe-roller authored Jan 25, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/401a93b1055698158b3fb50a98aebb51e830ac44 [expect_tests] Add show_missing flag to coverage.report. (iannucci@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2655953002

5c34046d

Python style fixes + unused imports removal in git cl and friends. · 18975328

Andrii Shyshkalov authored Jan 25, 2017

R=sergiyb@chromium.org
BUG=

Change-Id: I9b886100557bf6efa9be07d40175f7bb919f5294
Reviewed-on: https://chromium-review.googlesource.com/432456Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

18975328

Improve debuggability of git cl tests. · 18df0cdf

Andrii Shyshkalov authored Jan 25, 2017

Change-Id: If14776d86a687a6edf5917f2a63ff984b812ecb8
Reviewed-on: https://chromium-review.googlesource.com/432376Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

18df0cdf

git cl: _RietveldChangelistImpl should always have non-None auth_config. · 98cef570

Andrii Shyshkalov authored Jan 25, 2017

TBR=phajdan.jr@chromium.org,sdefresne@chromium.org

Change-Id: I95cc6e61d044fd983c613fa7eeb21c8b77d7cee0
Reviewed-on: https://chromium-review.googlesource.com/432356Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

98cef570

git cl: remove code related to pending refs and gnumbd. · f3a20aed

Andrii Shyshkalov authored Jan 24, 2017

Refactor _GitNumbererState to two functions and remove no longer
useful tests.

BUG=644915
R=agable@chromium.org

Change-Id: If5e3e3b141aee192211f6af130b01f20f9afdbfe
Reviewed-on: https://chromium-review.googlesource.com/431976Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

f3a20aed

For Gerrit: use CURRENT_COMMIT option to get description, not gitiles. · 9c3a464b

Andrii Shyshkalov authored Jan 24, 2017

R=sergiyb@chromium.org
BUG=681704

Change-Id: I48804955d8e5e579eae6e60fccac304aaaa9230e
Reviewed-on: https://chromium-review.googlesource.com/430625Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

9c3a464b

Add cl description backup to gerrit upload. · f732cd5c

Christopher Lam authored Jan 24, 2017

BUG=684261

Change-Id: I2716864526fcedf44e561be8512843e12810e3a9
Reviewed-on: https://chromium-review.googlesource.com/431459Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

f732cd5c

Roll recipe dependencies (trivial). · cd091367

recipe-roller authored Jan 25, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/aae62c656032cf63284aecac5e974676064d8896 path module: fix tmp / cache dir creation (nodir@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2656753002

cd091367

24 Jan, 2017 10 commits

Put git cl format JS formatting behind a flag. · c5ba692d

Christopher Lam authored Jan 24, 2017

This CL moves JS formatting behind the --js flag for git cl format
due to issue with LayoutTests. It also adds an option to check
javascript for the presubmit canned formatting check.

BUG=567770

Change-Id: I9c080b1136f6ffef9fb1b08d3bfc97ce5b3185dc
Reviewed-on: https://chromium-review.googlesource.com/430526Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Christopher Lam <calamity@chromium.org>

c5ba692d

[git rebase-update] Handle error when chdir'ing to original workdir. · c87e36aa

Robert Iannucci authored Jan 24, 2017

BUG=

Change-Id: I1dc7f20eea3f4b1be9179aa6d77bdee08ab8a04f
Reviewed-on: https://chromium-review.googlesource.com/431576Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>

c87e36aa

git cl status: re-use existing ChangeList object. · d0e1d9d9

Andrii Shyshkalov authored Jan 24, 2017

This way we avoid extra RPC to codereview site.

R=sergiyb@chromium.org
BUG=681704

Change-Id: I81f9ac1b8fe4cfaa95458a5669735168185c47e5
Reviewed-on: https://chromium-review.googlesource.com/430639
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>

d0e1d9d9

Gerrit git cl: cache change detail to save on RPC calls. · 258e0a65

Andrii Shyshkalov authored Jan 24, 2017

R=sergiyb@chromium.org
BUG=681704

Change-Id: I5c320f7e6442a92ae0574e2ca6481a082e82568a
Reviewed-on: https://chromium-review.googlesource.com/430795
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>

258e0a65

git cl status: use smarter parallel processing. · 2f8e9241

Andrii Shyshkalov authored Jan 23, 2017

Previously, 1 CL was queried first, followed by all remaining ones
in parallel. The purpose was to ensure that valid authentication
token is present. However, it still required one call to Rietveld
or Gerrit, needlessly increasing latency.

This CL first loops over all CLs and ensures that credentials are
present, refreshing refresh tokens for Rietveld if necessary. Then,
all CLs are queried in parallel.

R=sergiyb@chromium.org,clemensh@chromium.org
BUG=681704

Change-Id: Ic125ac7c2a684d6f3c34e4e8b899192abbed01bb
Reviewed-on: https://chromium-review.googlesource.com/431033Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

2f8e9241

Revert "Fix OWNERS canned check to avoid duplicate output." · 3c86cee3

Dirk Pranke authored Jan 24, 2017

This reverts commit 66c50ea1.

Reason for revert:
Breaks some OWNERS checks. See https://crbug.com/684270 for details.

Original change's description:
> Fix OWNERS canned check to avoid duplicate output.
>
> 1. Update PanProjectChecks() to supply source_filter to CheckOwners().
>    This prevents files under e.g. third_party/WebKit being checked both
>    by the top-level and sub-directory PRESUBMIT rules.
> 2. Fix CheckOwners() to list missing-OWNERS only for the sub-directory
>    it is invoked on, rather than the whole CL. This prevents files under
>    sub-directories with their own PRESUBMIT rule, within the same repo,
>    from causing OWNERS to be checked for files outside that directory.
>
> BUG=
>
> Reviewed-on: https://chromium-review.googlesource.com/426003

TBR=wez@chromium.org,dcheng@chromium.org
BUG=684270

Change-Id: I094818a6fa3e16fbac0d37d2596a40210611ee05
Reviewed-on: https://chromium-review.googlesource.com/431656Reviewed-by: Dirk Pranke <dpranke@chromium.org>

3c86cee3

Include branch name in git-squash-branch's default message · 0001782a

Alan Cutter authored Dec 20, 2016

Change-Id: I5dfa6017d1c938f8e1c55fbd6e607909aa4d6811
Reviewed-on: https://chromium-review.googlesource.com/422589Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Alan Cutter <alancutter@chromium.org>

0001782a

Roll recipe dependencies (trivial). · 4298c619

recipe-roller authored Jan 24, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/61760cd8bc43a539ddbf9bf69abe5049d3682f71 Remove ret code requirement (martiniss@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2655573002

4298c619

Roll recipe dependencies (trivial). · dee9e33c

recipe-roller authored Jan 24, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/d87e1df614c1b51a4bd09d9fd947fecc0c096f8b path module: make sure tmp / cache dirs exist (nodir@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2649893003

dee9e33c

Only prompt for clean titles if manually set · 856585dd

Aaron Gable authored Jan 23, 2017

We have to clean up the title, but if the user hasn't expressed any
input about the title (i.e. it's one we autogenerated), then don't
bother them by pointing it out.

BUG=684079

Change-Id: I8215e0a30f786466697fe1df178ca90e1980d9b0
Reviewed-on: https://chromium-review.googlesource.com/431162
Commit-Queue: Aaron Gable <agable@chromium.org>
Reviewed-by: Andrew Bonventre <andybons@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>

856585dd

23 Jan, 2017 1 commit

git cl + gerrit_util: improve diagnostic logging. · 5b04a57a

Andrii Shyshkalov authored Jan 23, 2017

BUG=681704

Change-Id: I1a774350aea901d4e9f2468cff111cbbcd7f3388
Reviewed-on: https://chromium-review.googlesource.com/430794
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>

5b04a57a

21 Jan, 2017 3 commits

Fix git cl on windows for git-numberer repos. · 351c61da

Andrii Shyshkalov authored Jan 21, 2017

Git cl decides if git-numberer is enabled on a repository by writing
Gerrit's project.config from refs/meta/config into a tempfile, which is
then queried using `git config -f tempfile --get ...`.  The file itself
is only flushed, but not closed after writing because Python's
tempfile.NamedTemporaryFile is deleted on closing. This worked fine on
Linix/Mac, but not on Windows, where `git config` apparently doesn't see
file or its contents.

This CL rewrites the above using yet another contexmanager temp
directory into which a file is written and closed before git config is
ran.

R=machenbach@chromium.org,grt@chromium.org
BUG=683202

Change-Id: I7974d66b1b2b0478ab4b6f7ac04e547a4981c46c
Reviewed-on: https://chromium-review.googlesource.com/430719
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>

351c61da

Roll recipe dependencies (trivial). · 857bc443

recipe-roller authored Jan 21, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/836fb28be142e5385a8715e4c61e23e8ee505ccd Whitelist CIPD_CACHE_DIR env var. (vadimsh@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2645173002

857bc443

Roll recipe dependencies (trivial). · 30eab01e

recipe-roller authored Jan 21, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/6c47cddd76e3159a41c353fd1c1b9bb53a8f065c Add multiprocessing.cpu_count access to platform module. (iannucci@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2647143002

30eab01e

20 Jan, 2017 2 commits

Remove unused FORCE_HTTPS_COMMIT_URL parameter from git-cl · e447411c

Aaron Gable authored Jan 20, 2017

BUG=

Change-Id: Ib8953a7fea4e3cd1c17ea277b5310a31821bfbe8
Reviewed-on: https://chromium-review.googlesource.com/431050Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>

e447411c

Roll recipe dependencies (trivial). · 0fe50fc4

recipe-roller authored Jan 20, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/1bd274dae8c58ecc146fc9111aab9f95ec81e0bd Make --deps-path=- put the temp dir in the real temp folder. (iannucci@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2646073002

0fe50fc4

19 Jan, 2017 4 commits

Add JS to git cl format. · 06dba1b1

Christopher Lam authored Jan 18, 2017

This CL adds .js to the list of file extensions that get clang-formatted.

BUG=567770

Change-Id: Ieed162a84ca68877e5107da1824b1f49c71d51ed
Reviewed-on: https://chromium-review.googlesource.com/429551Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Dan Beam <dbeam@chromium.org>

06dba1b1

Roll recipe dependencies (trivial). · 147c5591

recipe-roller authored Jan 19, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/33e10996a4a093ff5a68eb2adb17ec052715fcfd Make failed checks immediately fail the test. (iannucci@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2644783002

147c5591

Roll recipe dependencies (trivial). · 2772cd87

recipe-roller authored Jan 19, 2017

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/b3b24239ad0b30c765cf728ef94b5b6a6e852b69 Add support for re._pattern_type to deepcopy during simulation_tests. (iannucci@chromium.org)

TBR=martiniss@chromium.org,phajdan.jr@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Review-Url: https://codereview.chromium.org/2641103002

2772cd87

Create recipe_modules/gerrit to interact with gerrit REST API · 833c94c6

dimu authored Jan 19, 2017

BUG=
R=mmoss,agable

Change-Id: I6410c28280ed05cf384a3da93e6b154c6081e039
Reviewed-on: https://chromium-review.googlesource.com/427375Reviewed-by: Michael Moss <mmoss@chromium.org>

833c94c6

17 Jan, 2017 1 commit

Improve clang-format error messages when run outside of chromium checkout · 54985b6b

Sam Clegg authored Dec 14, 2016

Its useful to be able to run clang-format on projects
outside of chromium. This change informs developers
how they can do that.

Change-Id: I01ef755aa6e5b53a0a5bb6377e92b2ffdfd17eff
Reviewed-on: https://chromium-review.googlesource.com/414204Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Sam Clegg <sbc@chromium.org>

54985b6b