resolved conflicts for merge of ec85aeb5 to master
authorDaisuke Miyakawa <dmiyakawa@google.com>
Fri, 17 Feb 2012 00:40:59 +0000 (16:40 -0800)
committerDaisuke Miyakawa <dmiyakawa@google.com>
Fri, 17 Feb 2012 00:40:59 +0000 (16:40 -0800)
commit55ceed4444ebc741273a17ed997401f236e613e5
tree0c4f3d065794eb96112e4ed2a8056b4db2369c80
parent87dc98839efe6f7398659a6adb01cecd8e870f93
parentec85aeb54b5593ab8aaf0361119c32512bc5ae47
resolved conflicts for merge of ec85aeb5 to master

Change-Id: Ic31edb98bab69421ec15050238f300f984d76405
res/values/strings.xml
res/xml/call_feature_setting.xml
src/com/android/phone/CallFeaturesSetting.java
src/com/android/phone/NotificationMgr.java