OSDN Git Service

am 96ec3f6f: am af140189: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 18:03:20 +0000 (10:03 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Feb 2012 18:03:20 +0000 (10:03 -0800)
commit5e67f113bcb63eebd66570efec5439f8f2018b98
treebd9bb74d9234490bfce8616a907e814997c85195
parentdd92a65c38925e8e30fa52c03b0e4f2f9d632b36
parent96ec3f6f0748c678201a0f3f63672d46c1b707d0
am 96ec3f6f: am af140189: Reconcile with ics-mr1-release

* commit '96ec3f6f0748c678201a0f3f63672d46c1b707d0':