| commit | 312933e0439f36dbfdb51dba14c6ef31fe94bfca | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Fri Jun 24 21:42:54 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 24 21:42:54 2016 +0000 |
| tree | 8f6d7d75ef108d8f900c7220ff0121e1f82b6541 | |
| parent | e37af56a6f0c78fc49e926d90dd65fc9d645c335 [diff] | |
| parent | 1af9a5895600469f2005554ecc346a53e9567b70 [diff] |
Merge \"Shortcut: Only \"main\" activities can have shortcuts.\" into nyc-mr1-dev am: 1af9a58956 Change-Id: Id878608aec49985228e129de9736b751c9ae8567