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-04-13 09:21:39 -07:00
Description
No description provided
3.1 GiB
Languages
Java 89.8%
Kotlin 10.2%