OSDN Git Service

Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a
authorJack Yu <jackyu@google.com>
Mon, 9 Jan 2017 22:33:12 +0000 (14:33 -0800)
committerJack Yu <jackyu@google.com>
Mon, 9 Jan 2017 22:33:59 +0000 (14:33 -0800)
commit9f60453361c37a2ea9a6884cb4027837b1d164b4
tree9ee9876dfbd818d1f4ddf37cdc255e0e33e8d082
parent99b73c61f2828ceac460349b664146cfb1ca5e91
parent5d14d99e434af815ed7fff224d178d3d72c164eb
Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a

Test: manual
Change-Id: I228ed62db45eeb5d384049b5b0fef57b0bcf9ac6
core/res/res/values/config.xml
core/res/res/values/symbols.xml