OSDN Git Service

am cff569f1: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:13:50 +0000 (10:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Feb 2012 18:13:50 +0000 (10:13 -0800)
commit6cffd425dac595da0ecd825b6e337a726916d9e8
tree02fa72becc778b81b85364f47c668ea03a59ded3
parentcca3be2bc474191f9d86e00e55152771803727d6
parentcff569f11cb4960ce5299bf6c198eeb7945dc224
am cff569f1: Reconcile with ics-mr1-release

* commit 'cff569f11cb4960ce5299bf6c198eeb7945dc224':