OSDN Git Service

am c90961d4: Reconcile with ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 Nov 2011 17:36:10 +0000 (09:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Nov 2011 17:36:10 +0000 (09:36 -0800)
* commit 'c90961d43102563b540d719e637905570f9856e4':


Trivial merge