tree ea7151dae5d27c03a4e63789c37e6afa92e1bc6c
parent ed3c8a11f98995c6bf210566ea10659cb3f3abff
parent 8e61d323bf536651f7be8a342b92f35d547b38b4
author Jisi Liu <jisi.liu@gmail.com> 1425512211 -0800
committer Jisi Liu <jisi.liu@gmail.com> 1425512241 -0800

Merge remote-tracking branch 'github/alpha-2-fix'

Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e