tree d63b4c3d7ff1010eccc515bdac359bd1c3a32ac8
parent c9c955a9fdc153cfe57970e0fd7b1a724f339630
parent debc046b898c4a3e62e3eddd26c89a732dd99b8b
author Tony Wickham <twickham@google.com> 1493835639 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1493835641 +0000

Merge changes from topic 'am-58d0617b-47f2-44b7-ac1f-c278ee055d1e' into ub-launcher3-master

* changes:
  Merge commit 'e3c59256794448c67e01333a9f5036559b1bd502' into am-58d0617b-47f2-44b7-ac1f-c278ee055d1e
  Use source bounds/activity options for App Info System Shortcut