tree 2d554cc50868a3d18b5f8bea501568ce20a36679
parent 77f6e911ad639c2d4a66bd140dfd5b38955df123
parent 4fc34416fb8d389557934f3000dab7b6fbafb97c
author Makoto Onuki <omakoto@google.com> 1459297753 +0000
committer android-build-merger <android-build-merger@google.com> 1459297753 +0000

Merge "ShortcutManager: proper work profile support" into nyc-dev am: d5b745a
am: 4fc3441

* commit '4fc34416fb8d389557934f3000dab7b6fbafb97c':
  ShortcutManager: proper work profile support

Change-Id: I1a708988b7e9c505370e2399572dca6caa9d5cef