tree 7bef9898660d13fc74dbe528bc0331950fe19604
parent 430b7ae4699eb3685dcc0f7c736a9aebd76829a8
parent 6fba98ce645bb00b4fa7f03dd1786566af919d78
author Tianjie Xu <xunchang@google.com> 1476825187 -0700
committer Tianjie Xu <xunchang@google.com> 1476826264 +0000

resolve merge conflicts of 6fba98c to stage-aosp-master

Change-Id: I2fa8b85109309ec88c1f8d8def593aa65ab885d7