| commit | 596b8c7eaaa73d2e24419849412be0d22c2c1c8c | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Tue Mar 15 20:12:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 15 20:12:16 2016 +0000 |
| tree | 4f9cd92baceeda9e2d9bc8e3754c1a1326e2c61e | |
| parent | 5d8fdb3b84b8f15da2b5e16c0d9650792e71eb13 [diff] | |
| parent | 8950c62362d35c96c03bac5a411dca042e044733 [diff] |
Merge "Don\'t override the setting activity shortcut" into nyc-dev am: 8950c62362 * commit '8950c62362d35c96c03bac5a411dca042e044733': Don't override the setting activity shortcut