| commit | 837a5fd72d4ee48b94d3c9f5dc9a409ecfd3caf9 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Thu Mar 10 00:22:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 10 00:22:17 2016 +0000 |
| tree | d057ba08323f28138906b25f5755273aaa568a08 | |
| parent | 911c45b132aed7f497fc97491afb5a63ab994252 [diff] | |
| parent | 495d124a67daa1f070ca0ca0be0c14377675200a [diff] |
Merge "ShortcutManaegr: load config from settings, also..." into nyc-dev am: 495d124a67 * commit '495d124a67daa1f070ca0ca0be0c14377675200a': ShortcutManaegr: load config from settings, also...