tree 7d84db1339b2d6776ed5a0ed557c1ac3a796e4c5
parent a4feb0c385723ae7356b9a46a3b1dca7728dc70f
parent d0f43ceba7eb4fb31d93fe949e2bafa945acac07
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1527729327 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1527729327 +0000

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

Change-Id: I4886d9a1880c35ebb36ccda20401e6c7e394dad9