OSDN Git Service

Merge commit 'f8bc27d9683e4089cdfd778dcb61ae67f44665b7' into manual_merge_f8bc27d
authorMichael Wright <michaelwr@google.com>
Wed, 20 Jul 2016 18:41:58 +0000 (19:41 +0100)
committerMichael Wright <michaelwr@google.com>
Wed, 20 Jul 2016 18:41:58 +0000 (19:41 +0100)
commit49bcc5dd80429ecfa1d518eef3726f83f4cb85d6
treefb49d5ff930b4671d3acbd48cadaff485a515fa5
parente22f254cdb5be8ca73c40782fd020d58bc47ea22
parentf8bc27d9683e4089cdfd778dcb61ae67f44665b7
Merge commit 'f8bc27d9683e4089cdfd778dcb61ae67f44665b7' into manual_merge_f8bc27d
core/res/res/values/config.xml
packages/SettingsLib/res/values/arrays.xml