OSDN Git Service

Merge commit 'android-4.0.4_r1.1' into ics-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 5 Apr 2012 10:01:44 +0000 (18:01 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 5 Apr 2012 10:01:44 +0000 (18:01 +0800)
commit6524283b5ba6d0f6f6a120fbec14254d659f5ced
treee5bb0eeabade873955fe85d1fc27117fcc787ec3
parentc9adda8972945d44e0285a0bbc701e39dd778690
parent815b2f3467aa1d1e98be7a0e2e8e5a6a8c8094ef
Merge commit 'android-4.0.4_r1.1' into ics-x86

Conflicts:
res/values-zu/arrays.xml
res/values-es-rUS/arrays.xml
res/values-pl/arrays.xml
res/values-pt/arrays.xml
res/values-ru/arrays.xml
res/values-sl/arrays.xml
res/values-zu/arrays.xml