tree 3ec3e7ebfe2ab5247fd5180ec95c5372744edf13
parent 686b9154354f150be3305b53bec6aabbab8ade9c
parent 0a1b7c2b2cfa37dbe8eaf753d2b06e2b0a1c9250
author Pengquan Meng <mpq@google.com> 1508801287 -0700
committer Pengquan Meng <mpq@google.com> 1508801287 -0700

resolve merge conflicts of 0a1b7c2b2 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic4ce6a0cf640ccd7706c66672ee75b716e795bc4