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)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 24 May 2017 21:52:38 +0000 (21:52 +0000)
commit4af8f912aa1ee714638d0f9694d6f856bc8166f3
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