OSDN Git Service

am 7e11af8f: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Jan 2012 23:52:27 +0000 (15:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Jan 2012 23:52:27 +0000 (15:52 -0800)
* commit '7e11af8f5813972dd64032e70068e10f87771234':


Trivial merge