tree 91505d714d9aff770434048c0dd9f114945e76fe
parent 94f80bce07febc80df1372fc84514b51c7b1e8c7
parent 6da9c2edfe49ddd57cb3f4d0f5cf5e9d03e7133d
author Alexander Lucas <alexlucas@google.com> 1394488945 -0700
committer Alexander Lucas <alexlucas@google.com> 1394488945 -0700

resolved conflicts for merge of 6da9c2ed to klp-ub-dev

Change-Id: I2997c1204ff7aa9728f4df782fefe9d413bfbba7