tree 0733d5db6687a9403fdbcacac250380d3b2878cb
parent 6c9d9dfd38529226ac6cad093cb3e0aa91c908fb
parent cebdd2259f4f85779e2e6d41bef99aa39d067fef
author Fabian Kozynski <kozynski@google.com> 1586554945 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586554945 +0000

Merge "Add controls rearrange activity" into rvc-dev am: 0935694b5a am: 7b4a6a8e4d am: 4c73a2c25c am: cebdd2259f

Change-Id: I9e5ee0d22f38f7de72a6ace9f01b523dc406743d