Mark Salyzyn 87a3c6fee7 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

2015-12-28 11:20:58 -08:00

..

arrays.xml

resolve merge conflicts of 94ab88228e to master.

2015-12-28 11:20:58 -08:00

strings.xml

Revert "Import translations. DO NOT MERGE"

2015-12-07 14:42:50 +00:00