| commit | bc6fe0f65025563ab50af193b099a8fca95ff0a2 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Oct 30 13:31:54 2013 -0700 |
| committer | Trevor Johns <trevorjohns@google.com> | Wed Oct 30 13:31:54 2013 -0700 |
| tree | c992baefc7e136d81ec5788238f2e9a54a94e1cb | |
| parent | 86e6edc9f6faa35d841c684286450bc70d190c27 [diff] | |
| parent | 7a7aad0a012e738c58d1444f1669887bee16eb2a [diff] |
Merge downstream branch 'developers-dev' into 'klp-dev' Consolidating changes from topic branch for release.