Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95a079ad authored by Chris Wren's avatar Chris Wren Committed by android-build-merger
Browse files

Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev am: cf665232 

am: b58e350e

* commit 'b58e350e':
  ShortcutManager: Implement max # of shortcuts

Change-Id: Ide9c5923c0dca42b5285ddcadda0716f2f00084b
parents 6343cb5a b58e350e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment