tree df43c018024a261b0b50e6c1337316b9f4de883a
parent 577455a74b47f057ab141e581b6832e767253050
parent 9829060491919e7651b9437181e9e8e1ffd8633f
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1526079798 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1526079798 +0000

[automerger] Fixing various quickscrup controls for fallback activity am: 9829060491

Change-Id: I55e492ce9ab67125bffc7aafb9c4dbc30bc9e2e1