Files
packages_apps_Settings/src/com/android/settings
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
..
2015-10-13 10:12:20 -04:00
2015-12-16 12:38:32 -05:00
2015-10-13 10:12:20 -04:00
2015-12-18 15:50:05 -05:00
2015-10-13 10:12:20 -04:00
2015-10-13 10:12:20 -04:00
2015-10-13 10:12:20 -04:00
2015-10-13 10:12:20 -04:00
2015-12-15 02:33:27 +00:00
2015-12-14 10:29:12 -05:00