tree b49430dcfba5102b7b887c90dbd0c43e52072e8c
parent a648206cd5ac00b2b89743fbd6c502889d5c201c
parent 9e40ef989437bc46362bc98e7fef65f2b992476c
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1527729328 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1527729328 +0000

[automerger] Some launcher3 fixes so that it compiles with different configurations am: d0f43ceba7 am: 9e40ef9894

Change-Id: Ie3eed75fab341dfe274a566c71d6b6fdbab70854