OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6343cb5 b58e350)
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)
am: b58e350e92

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

Change-Id: Ide9c5923c0dca42b5285ddcadda0716f2f00084b


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help