OSDN Git Service

am 16bdd1e6: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 03:13:18 +0000 (19:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Dec 2011 03:13:18 +0000 (19:13 -0800)
* commit '16bdd1e65ef19379bbede40c38de2e9f816ba35b':


Trivial merge