tree c88023067609d78c0943608dc720bdc56bc7363b
parent ec2a6983019d2ff71367c60358f100608ce2936f
parent 40cb61c6bd56271c8efed6ce06ea9db896de494c
author Junxiao Shi <git@mail1.yoursunny.com> 1443321329 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> 1443321342 -0700

Merge branch 'feature-lp' into master

Change-Id: I2efd0bf044c07b8cdaf03ab62a9b6b71a76b8b09