OSDN Git Service

Merge \"Don\'t backup & restore disabled shortcuts.\" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Tue, 12 Jul 2016 22:11:54 +0000 (22:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jul 2016 22:11:54 +0000 (22:11 +0000)
commitbc15e3ca2bf0ea00a9401c9c2cedb80a3ec175f7
treec6634258c6dae9280dd6572e6191ebb3c974f7c1
parentd0c3bc327d3e90486a67dd0ef3e9e8bb5bbbab58
parent4885b274c1502b8e478e16d4418b7fd86ab6c865
Merge \"Don\'t backup & restore disabled shortcuts.\" into nyc-mr1-dev
am: 4885b274c1

Change-Id: I23c46fa144ac1b4989a4cd93cf442b812c7d1324