tree d88f785bf323ebdfc383eb9b06dbda1239c0e819
parent 38236d0f35a67fe4fe305c7d73d1e46e0d99cb80
parent 4f86f26a3da5a0a612b0d7b5305847a6c2dae195
author Tao Bao <tbao@google.com> 1479280404 -0800
committer Tao Bao <tbao@google.com> 1479280404 -0800

resolve merge conflicts of 4f86f26 to stage-aosp-master

Change-Id: I3ee609df70c60e16a610913b2c95892c9d74cb3e