tree faf72408c9a9025fb629d17ba71aae0e95b60bdd
parent d9a817b21ba503489c330ebe8671c998aefb325d
parent 7fab32195050198c2d3eb4787f88663907a7949d
author android-build-team Robot <android-build-team-robot@google.com> 1525295267 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525295267 +0000

Merge changes from topic "am-b60f539c-4933-450b-b98e-9b22d17cb071" into ub-launcher3-master

* changes:
  [automerger] Fixing Launcher3Quickstep build, broken due to SDK changes am: ea992acc2f
  Fixing Launcher3Quickstep build, broken due to SDK changes