OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:08:07 +0000 (08:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:08:07 +0000 (08:08 -0800)
commit7e97651fe39de4b3630f8d5bea146db3225cfccd
tree485b152b97bf8321fdd223f35587bb4294672be8
parent480be20aba2753ebac456b0d9519a12b36aeccd0
parent73ce0264185a04cc7c819b4dac92e58ec96e6430
Reconcile with ics-mr1-release

Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da