| commit | f453c3fb72e86e8a0caf42fdcd9989471cd7b6b9 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Thu Oct 31 12:18:09 2013 -0700 |
| committer | Trevor Johns <trevorjohns@google.com> | Thu Oct 31 12:18:09 2013 -0700 |
| tree | 2f29a7a557bcae2c8d97906067d8a0536aae99e7 | |
| parent | 635d8a06fe9f0fe837eeb36e833a18d36967c338 [diff] | |
| parent | 82cf9ce06d8b591469716073f1882ee824419460 [diff] |
Merge downstream branch 'developers-dev' into 'klp-dev' Reconciling topic branch changes from KLP launch preperation. This will also re-merge the samples that needed to be backed out yesterday.