tree 4fd0091db43903f9df5a75055dbd95732245c1c9
parent f46041a7d459018fcddd5e03802320ceee74c44f
parent 70172d76ef1b7563cf1bc508cb8045a192ad25a0
author Tao Bao <tbao@google.com> 1478630987 -0800
committer Tao Bao <tbao@google.com> 1478630987 -0800

resolve merge conflicts of 70172d7 to stage-aosp-master

Change-Id: I7626b57f9c8fd722708862ff1ae09c4fc0def51c