OSDN Git Service

am 4b067bdf: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:11:48 +0000 (10:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Feb 2012 18:11:48 +0000 (10:11 -0800)
commitbf44ac49575fac76936eb0e1ac2e924ea45930cd
tree8d5feb7e5a3dc256467308e7d0c4aada5a016816
parent90b66d881a065b5df86af5b415cc2399e29905a4
parent4b067bdf05bd8fca840253a43fb0ff25846d35c1
am 4b067bdf: Reconcile with ics-mr1-release

* commit '4b067bdf05bd8fca840253a43fb0ff25846d35c1':