OSDN Git Service

Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev am: cf665232f3
authorChris Wren <cwren@android.com>
Thu, 2 Jun 2016 21:07:43 +0000 (21:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Jun 2016 21:07:43 +0000 (21:07 +0000)
commit95a079adf280b94ffca16ac82e1cf257ddb6502b
tree82bd3e15169a85c950ebfcdf361f09ceb943fda9
parent6343cb5acd6b375cd4e2129e5709ee765e421f48
parentb58e350e9266b8ced268b21900ab6c065dcac218
Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev am: cf665232f3
am: b58e350e92

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

Change-Id: Ide9c5923c0dca42b5285ddcadda0716f2f00084b