OSDN Git Service

resolve merge conflicts of d5b3a5d to nyc-mr1-dev
authorTony Mak <tonymak@google.com>
Wed, 4 May 2016 10:14:48 +0000 (11:14 +0100)
committerTony Mak <tonymak@google.com>
Wed, 4 May 2016 10:14:48 +0000 (11:14 +0100)
commit8f14564787da3705a895e945c72c890604d13cfd
treede02d1f63e3ff94549d88054e25d34222480b79f
parentcce4c8e845f4d5096c82da25e872c35854b3b0f3
parentd5b3a5d342d74411b0e4466541d5c5b1168eb803
resolve merge conflicts of d5b3a5d to nyc-mr1-dev

Change-Id: I1eb01bfdad24935efbbdbeaee0dcf1c374a2cadb
res/values/strings.xml
src/com/android/settings/SettingsActivity.java