| commit | 248137f7ae6216eea4628ded68e3eb3dfdcf6a6a | [log] [tgz] |
|---|---|---|
| author | Tom Taylor <tomtaylor@google.com> | Wed Feb 12 15:57:32 2014 -0800 |
| committer | Tom Taylor <tomtaylor@google.com> | Wed Feb 12 15:57:32 2014 -0800 |
| tree | 7c6fc68b7fd285951d00f60e0fe89e8da820ba70 | |
| parent | 178f8818eb80316d16e3852b83bfdf14e1130407 [diff] | |
| parent | f839f938425a00021edf6756ad4f96f837dbf642 [diff] |
resolved conflicts for merge of f839f938 to klp-dev Change-Id: Ib6d5a93e2c51ab9cd0aef09a77097c1247247117