Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4 am: 96ef96b563" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-05-03 16:42:33 +00:00
committed by Android (Google) Code Review

Diff Content Not Available