tree fee6c2c8bf9151b1c39ac7ae2c6802b52aea2d02
parent 25ac0502b063fdace9b01645a0c3867d276d7aaa
parent 94ab88228e15b0554179d476f05c0febe4da218d
author Mark Salyzyn <salyzyn@google.com> 1451329681 -0800
committer Mark Salyzyn <salyzyn@google.com> 1451330458 -0800

resolve merge conflicts of 94ab88228e to master.

NB: packages/apps/Settings/res/values/arrays.xml new content
moves to frameworks/base/packages/SettingsLib/res/values/arrays.xml.

Bug: 26178938
Change-Id: Ib241baac7807914447d84b921994440bf627df29