OSDN Git Service

am f9d0ce5f: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Jan 2012 18:41:32 +0000 (10:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 Jan 2012 18:41:32 +0000 (10:41 -0800)
commit4583b8276f7bace5a4d8c88d69663097d45e0666
tree1984d5e63c0c437db613bc4c846256790371d313
parent2cab0464b0cdaa6bbbc43c066a9fa10478e0cc19
parentf9d0ce5f917adc46d1940425eff9d0f5b8459ff6
am f9d0ce5f: Reconcile with ics-mr1-release

* commit 'f9d0ce5f917adc46d1940425eff9d0f5b8459ff6':