| commit | 165fc6dc28abb6c14ca920f777b5228a0c64b980 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Fri Apr 29 21:23:36 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 29 21:23:36 2016 +0000 |
| tree | 295a33eeaacf1221da832694cb4fbe6461b8635a | |
| parent | 2f23a509e7a9759ca961a40c5fd06d5e3449bbb4 [diff] | |
| parent | e83c46210a236b2436da0a7b5a69385b4b6bc991 [diff] |
Merge "Merge "ShortcutManager sample update:" into nyc-dev am: cb84ec875e am: 0ccaed41a3" into nyc-mr1-dev-plus-aosp am: e83c46210a * commit 'e83c46210a236b2436da0a7b5a69385b4b6bc991': Change-Id: I3ec30d2337dc08d30c28b0cd688a487a3b8f2a59