tree 0f7256d10e63bb682c79d3a1ff123a092ab06a38
parent 8176cf232e9f613a2e500f09461fc3f448267d07
parent e89bf257a1e8304194b426467bb923eb34967396
author Tao Bao <tbao@google.com> 1476828487 -0700
committer Tao Bao <tbao@google.com> 1476828487 -0700

resolve merge conflicts of e89bf25 to stage-aosp-master

Change-Id: I3b0ddb23daf264d407370cd8ace31eceb230a11a