OSDN Git Service

am c9024703: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:19:45 +0000 (10:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Feb 2012 18:19:45 +0000 (10:19 -0800)
* commit 'c902470310404e42aeb93fca38694b374371e0de':


Trivial merge