OSDN Git Service

am 40375099: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 23:39:19 +0000 (15:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Dec 2011 23:39:19 +0000 (15:39 -0800)
commit25b1e93b052ed3590c1ee4d03476c242187de36b
treeed289e8d756105114a04b35dbef3c027454f49f7
parent50a44951baf856cda679e78947e369ce923a6517
parent956a9787cfaf429f951549df6e587c6ce4ac20f8
am 40375099: Reconcile with ics-mr1-release

* commit '40375099d10139b6c96c1db8b8295874d60c712e':