tree 3f1125301f986a8755b3541fd8140a1aa983e203
parent 927a4083f9e9113acb45e4fa3fd9c33c1841b051
parent e474f14f65c09040b710b0361f6641d186fabc51
author android-build-team Robot <android-build-team-robot@google.com> 1525896779 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525896779 +0000

Merge changes from topic "new-caret" into ub-launcher3-master

* changes:
  [automerger] Adding a carent in the scrim am: ef39540dde
  Adding a carent in the scrim