OSDN Git Service

am 229b77b0: am 96859329: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 Feb 2012 19:20:00 +0000 (11:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Feb 2012 19:20:00 +0000 (11:20 -0800)
commit2d93d69686500dc5b044383c9e535824df847136
tree2116625accfe989b57ed799cdde0f955ab80eba8
parent2147b6b3411e2b5e81158852830f92a6529cc1ca
parent229b77b06fe7a9b4873140c281720fddb33db4b0
am 229b77b0: am 96859329: Reconcile with ics-mr1-release

* commit '229b77b06fe7a9b4873140c281720fddb33db4b0':