| commit | 6ae4d53b571cb71cc6c2ad55d12679d22e9334d5 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu Mar 13 21:07:33 2014 -0700 |
| committer | Jeff Brown <jeffbrown@google.com> | Thu Mar 13 21:07:33 2014 -0700 |
| tree | 5b1109d42bf49d77eacbbfafb2661588b8b4cebb | |
| parent | 41685ce983abd6b4ccbb0ae8043d6a1dc118f7d3 [diff] | |
| parent | db3146c039750f68418e0908037a8bed3890913c [diff] |
resolved conflicts for merge of db3146c0 to klp-modular-dev Change-Id: I1500228392add2de325b9530ae33d7c3e738c021