OSDN Git Service

am bb712edd: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Dec 2011 13:40:55 +0000 (05:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Dec 2011 13:40:55 +0000 (05:40 -0800)
commitc46de71ff4b2613526e35ee878e359ae5c855d20
treeaf37eab0da209ac769a7d9d449ff51a9b21109ce
parentee4c1be2600c14d2f023ad89999ac5f4b4293264
parentbb712edde58d3b4069bb7f1f63895522ce651579
am bb712edd: Reconcile with ics-mr1-release

* commit 'bb712edde58d3b4069bb7f1f63895522ce651579':