OSDN Git Service

am 2fc1b62a: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:06:46 +0000 (10:06 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Feb 2012 18:06:46 +0000 (10:06 -0800)
* commit '2fc1b62a9cacfc28fc6a8b4b1e42a1aded82ca23':


Trivial merge