tree 1a1b19b7c252c41603cdf48d4d47a05700694f96
parent cbcefaf85c20cbbb2723544461ddcd221e06b0a7
parent 4d36b3a8c5ba1289d851ef337e46709bba333100
author Makoto Onuki <omakoto@google.com> 1462292864 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462292866 +0000

Merge "ShortcutManager: finishing touches" into nyc-dev