OSDN Git Service

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
authorDmitry Dementyev <dementyev@google.com>
Wed, 8 Mar 2017 03:47:52 +0000 (19:47 -0800)
committerDmitry Dementyev <dementyev@google.com>
Wed, 8 Mar 2017 03:52:02 +0000 (19:52 -0800)
commite24780ed4ca05a3adf7114bcf4a95abaccd2f317
tree22109ad518236eb6f28aa35d121b6ba1140367b9
parent56d630a3eda390d8514c1e1d9f36c95e7808d1dd
parent75ae46d035ce600be3cac3ee597d5e379636fa42
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev

Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:
src/com/android/settings/accounts/ManageAccountsSettings.java