OSDN Git Service

am af140189: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 18:00:29 +0000 (10:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Feb 2012 18:00:29 +0000 (10:00 -0800)
commit96ec3f6f0748c678201a0f3f63672d46c1b707d0
tree9a723d783c70f404c03f570a5e126cf2b4628659
parent81894b3aa4215d389a0673826a76a1839f578dcb
parentaf140189514d64be270439303eb0f0ab26583af5
am af140189: Reconcile with ics-mr1-release

* commit 'af140189514d64be270439303eb0f0ab26583af5':