OSDN Git Service

Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
authorMatthew Fritze <mfritze@google.com>
Wed, 17 May 2017 18:50:28 +0000 (18:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 May 2017 18:50:28 +0000 (18:50 +0000)
commitaf054e63e022a06a83e0a3c1c6a8f911c5bd9dd6
treea5d4a070090b81aa9581f2c117bde93ac900d82e
parent020dd7b169d3b7a28d7f785b5e2ead0c332f8350
parent4bd0f411ce577b37fb59a1c347154fc282c568e3
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
am: 4bd0f411ce

Change-Id: I680a407f9955e74b66e5c87af6b8a8d4335c530d