OSDN Git Service

Reconcile with ics-mr0-release ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 21:25:45 +0000 (13:25 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 21:25:45 +0000 (13:25 -0800)
commit8c3ddf9442d04cf19dba88381fbbb53d587d5979
treeddf16b552a96e4e454ca8be149e5a1552ffa53d0
parenta7e4865306b72e8eb97ee73719c897c432c53a0c
parenta1f988df2d273b716fd36f888c228fc94143d237
Reconcile with ics-mr0-release ics-mr1-release

Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad