| commit | cf956f533259892d725f09eb985370fadd5a2377 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Thu Oct 31 12:20:11 2013 -0700 |
| committer | Trevor Johns <trevorjohns@google.com> | Thu Oct 31 12:20:11 2013 -0700 |
| tree | 5bffe0a228230e8ae5ca226e8e8b4537db84ceac | |
| parent | 1d697a74b47694a954b2d80414bc59d3efcc6543 [diff] | |
| parent | d0a82fb6f1e7ca448f9907b4ac5e2a4df812006f [diff] |
Merge downstream branch 'developers-dev' into 'klp-dev' Reconciling topic branch changes from KLP launch preperation.