| commit | 1d697a74b47694a954b2d80414bc59d3efcc6543 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Oct 30 13:44:18 2013 -0700 |
| committer | Trevor Johns <trevorjohns@google.com> | Wed Oct 30 13:44:18 2013 -0700 |
| tree | 12c1d663ffb04b4b4ee3db4340f3a7a6c73f071d | |
| parent | 2b1169e2095f5e30f118abd146a62007697cecc3 [diff] | |
| parent | f884137fe0c6a1eb9b973e308e2cfdce44c9b83f [diff] |
Merge downstream branch 'developers-dev' into 'klp-dev' Consolidating changes from topic branch for release.