diff options
| author | Chris Wren <cwren@android.com> | 2016-06-02 21:07:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-02 21:07:43 +0000 |
| commit | 95a079adf280b94ffca16ac82e1cf257ddb6502b (patch) | |
| tree | 82bd3e15169a85c950ebfcdf361f09ceb943fda9 /docs/html/sdk/api_diff | |
| parent | 6343cb5acd6b375cd4e2129e5709ee765e421f48 (diff) | |
| parent | b58e350e9266b8ced268b21900ab6c065dcac218 (diff) | |
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
Diffstat (limited to 'docs/html/sdk/api_diff')
0 files changed, 0 insertions, 0 deletions