tree 137b4da38487707952c288fdeafc632816abbe8e
parent 0e924b9f0f30b54a575e34b237087093fbb0024c
parent dba2960d823530e7e53defa1ffbc8ccddf53e861
author Khai Do <zaro0508@gmail.com> 1474947879 -0700
committer Khai Do <zaro0508@gmail.com> 1474947879 -0700

Merge branch 'stable-2.11' into master

Change-Id: I0e2c67b34696e43c07ff97a8444c43f1fb35042e