| commit | f1bdbdd1bea9662f6731b7a366de1f602f43e5a9 | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Tue Dec 17 11:56:22 2013 -0800 |
| committer | Greg Hackmann <ghackmann@google.com> | Tue Dec 17 11:56:22 2013 -0800 |
| tree | 0242af45729a984cae77056f889777bef91bbb88 | |
| parent | 552eba80ef8f48204e77129dd99581d8f0ac3831 [diff] | |
| parent | 0857992140512a2e3d947da54e303374848670dc [diff] |
resolved conflicts for merge of 08579921 to klp-modular-dev Change-Id: I08e9f9a2d2185ccf0c41a87c8527ea7e02ac3117