| commit | a1452709840ebf82bb9bb677faeeb6d808b9d4b1 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Fri Feb 14 13:59:19 2014 -0800 |
| committer | Shawn Pearce <sop@google.com> | Fri Feb 14 13:59:19 2014 -0800 |
| tree | 9c71704889b762c4f871841de9937555824c60b2 | |
| parent | a4d91620b7b6d3f90eac8ff881017e19b2c02845 [diff] | |
| parent | a0b62862cc6f74c249fcd2c8bf482f4aa5304b58 [diff] |
Merge branch 'stable-2.8' * stable-2.8: Make sure change-merged event contains correct patch set number Documentation: Improve the description of the change screen preference Conflicts: Documentation/intro-change-screen.txt Change-Id: Icb06251ea52f55de3c1335c64f668feabf3f2851