tree 1eeae3888d61720a9d7869d3f9d5ad4ef04c89c7
parent 7f346c9058f39a533a2eaadc9ebc4001397c6ff9
parent 531c26be6445110360042f1c94952fbcb76d4971
author Zhengyin Qian <qianzy@google.com> 1440023466 -0700
committer Zhengyin Qian <qianzy@google.com> 1440023466 -0700

resolved conflicts for merge of 531c26be to cw-e-dev

Change-Id: I02a7a956d2423f86bc790473687b80bb3132f6dc