| commit | 1bf478743eeb0d33721f0f5bede004070a5bc70d | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Nov 05 15:31:22 2013 -0800 |
| committer | Joe Fernandez <joefernandez@google.com> | Tue Nov 05 15:31:22 2013 -0800 |
| tree | d96d08a03fc52f41b3384e2e890df346ac39e52f | |
| parent | 81dec975e49a0bd4b51e7203a6da993252e6cd0a [diff] | |
| parent | 559a00ad187ae4da86b339cd7505d085af3ee7ea [diff] |
resolved conflicts for merge of 559a00ad to klp-ub-dev Change-Id: I938f7fe6bcf927ceaeac9b270b8f6b023b21ac91