OSDN Git Service

resolve merge conflicts of 3964c51bf2 to nyc-dev
authorDmitry Dementyev <dementyev@google.com>
Thu, 9 Mar 2017 00:32:00 +0000 (16:32 -0800)
committerDmitry Dementyev <dementyev@google.com>
Thu, 9 Mar 2017 01:12:40 +0000 (17:12 -0800)
commit0f04a5a93f846d6f2d528ab6ae0c9e37d701e438
tree16b57a7b410e816e6f72d1b2d4a8409be59a6eb4
parent225c634f99911c373c99c2aedfda47f9b04eb335
resolve merge conflicts of 3964c51bf2 to nyc-dev

Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
src/com/android/settings/accounts/ManageAccountsSettings.java