OSDN Git Service

Merge commit 'android-4.0.4_r1.1' into ics-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 4 Apr 2012 16:17:46 +0000 (00:17 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 4 Apr 2012 16:17:46 +0000 (00:17 +0800)

Trivial merge