OSDN Git Service

am 37d6d98f: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 3 Mar 2012 00:48:24 +0000 (16:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 3 Mar 2012 00:48:24 +0000 (16:48 -0800)
* commit '37d6d98fe3ea739627e03b78196faba55b427503':


Trivial merge