Jason Monk 3ab68966b8 resolve merge conflicts of f2cd0f616e to master ...

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

2017-09-06 13:16:28 -04:00

..

android

resolve merge conflicts of f2cd0f616e to master

2017-09-06 13:16:28 -04:00

google/android

…