| commit | 81dec975e49a0bd4b51e7203a6da993252e6cd0a | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Nov 05 15:21:32 2013 -0800 |
| committer | Joe Fernandez <joefernandez@google.com> | Tue Nov 05 15:21:32 2013 -0800 |
| tree | d96d08a03fc52f41b3384e2e890df346ac39e52f | |
| parent | 425c9e0e653f3612b68baa3e0200e7faae11550c [diff] | |
| parent | 43730d47796483652721b354ec5a4d7c6d291710 [diff] |
resolved conflicts for merge of 43730d47 to klp-ub-dev Change-Id: Iddf9c792ff86a1db2c882f3d53d7d05e00261fe9