| commit | 0f3323555c3fe6c1b34dc9032719cb085c9e8f1f | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Mon Jul 11 18:36:12 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 11 18:36:12 2016 +0000 |
| tree | 724224d58e719a489bcb293ca8c04bf779fa7751 | |
| parent | ce69622596a4004a56ea58a2d19d84897a6d7762 [diff] | |
| parent | 4aa351c0ec1f5cef4bcef8d87320642feb4f88cd [diff] |
Merge "ShortcutDemo: Add 2nd main activity with manifest shortcuts" into nyc-mr1-dev