OSDN Git Service

Reconcile with ics-mr0-release ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:42:32 +0000 (15:42 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:42:32 +0000 (15:42 -0800)
commitc637289fdfbea45a322601ce74f743595c477339
treeba93f0ab66c0387e0fb71beb3813d357c571d1f7
parent7383d41aa2821544efaf55d57ff55ac5358a8a19
parentaaa12ed10abb5d8ed6a1a939885114d1c87c9b7c
Reconcile with ics-mr0-release ics-mr1-release

Change-Id: I31643242d240b4d1efef685583ec21934a88cc02