| commit | 87a3c6fee755f2c75be4fe6ad11b67b82bbb7605 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Mon Dec 28 11:08:01 2015 -0800 |
| committer | Mark Salyzyn <salyzyn@google.com> | Mon Dec 28 11:20:58 2015 -0800 |
| tree | fee6c2c8bf9151b1c39ac7ae2c6802b52aea2d02 | |
| parent | 25ac0502b063fdace9b01645a0c3867d276d7aaa [diff] | |
| parent | 94ab88228e15b0554179d476f05c0febe4da218d [diff] |
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