Skip to content
Commit 6bf60943 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "DO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with..." into oc-mr1-dev 

am: c63c9f8a

Change-Id: Ib006982c87cc4378c697e213504adc05cf2c0658
parents fdde7e4a c63c9f8a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment