OSDN Git Service

am 19417bef: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 22:57:41 +0000 (14:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Dec 2011 22:57:41 +0000 (14:57 -0800)
* commit '19417befca4aa6b3d55b6d23103b75ee54ff6e89':


Trivial merge