OSDN Git Service

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c
authorDmitry Dementyev <dementyev@google.com>
Wed, 8 Mar 2017 19:11:13 +0000 (19:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Mar 2017 19:11:13 +0000 (19:11 +0000)
commit3a5e567ab9c7ed23eafdadafc56a3e28f9237289
tree280dc84f8cc7b6e5188e37ecfddda3a798314267
parentc94f2b93afa2db9d87f9d8e0dc0c8709f16a326d
parent5c4276a258d3c692c053ea4aed4a8233e7f5c2b5
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258

Change-Id: Iba7445a15febacfd49ee8a415d8b5a02691b084b
src/com/android/settings/accounts/ManageAccountsSettings.java