| commit | 7e4a7fcfae433aca9fb6ac1255aba82865dd6a88 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Thu Mar 10 00:24:23 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 10 00:24:23 2016 +0000 |
| tree | 477bb6c73dad1862a2d7616eb3b060975f1e71c8 | |
| parent | 180092b8239b55352c7d8dd31091bd43abe64962 [diff] | |
| parent | 837a5fd72d4ee48b94d3c9f5dc9a409ecfd3caf9 [diff] |
Merge "ShortcutManaegr: load config from settings, also..." into nyc-dev am: 495d124a67 am: 837a5fd72d * commit '837a5fd72d4ee48b94d3c9f5dc9a409ecfd3caf9': ShortcutManaegr: load config from settings, also...