OSDN Git Service

Merge from ics-mr0
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Nov 2011 02:26:35 +0000 (18:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Nov 2011 02:26:45 +0000 (18:26 -0800)
commit600298c0baf773030d726f3a18bc543af98e13d4
treec1a9ba0d4b08b5d4ae2f88feb6208d988ff9e604
parentcb48497ff2f84e8f7def981246ddc028ea126879
parent278c9781ec5d2ef289fee635dfcfd8befcfe531b
Merge from ics-mr0

Change-Id: I759452c031b9e2f02905dd488b61f100e3eaa87a