OSDN Git Service

am 134c0348: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 21:59:21 +0000 (13:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Feb 2012 21:59:21 +0000 (13:59 -0800)
* commit '134c0348f9643eff06e1d69f7a144a1870aa29e4':
  IMM54


Trivial merge