OSDN Git Service

Merge commit 'android-4.0.4_r2.1' into ics-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 18 Jun 2012 08:12:03 +0000 (16:12 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 18 Jun 2012 08:15:32 +0000 (16:15 +0800)

Trivial merge