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)
committerJP Sugarbroad <jpsugar@google.com>
Fri, 21 Apr 2017 21:49:34 +0000 (21:49 +0000)
commitaf50c7db996303b2e2232c15a8b24f8ed4e03719
tree71bbcd4260b47d1d2f6428741da06a09c7e360e9
parent9ac842a753ebd0b228fe31a81671ff60c23fe1e7
resolve merge conflicts of 3964c51bf2 to nyc-dev

Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
(cherry picked from commit 0f04a5a93f846d6f2d528ab6ae0c9e37d701e438)
src/com/android/settings/accounts/ManageAccountsSettings.java