tree 24301d0c0d3abbfa8b88e4c0ffcb94dde4018a10
parent 9289faa163b2c4ea449cf466cd29dac061647b3e
parent 8947f59f964fba9f06a34297ba4a8f63ac2d3e4a
author Hyunyoung Song <hyunyoungs@google.com> 1494869769 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494869776 +0000

Merge "Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts)" into oc-dev