OSDN Git Service

am f815dc4e: am 64a907c5: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 Feb 2012 19:20:30 +0000 (11:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Feb 2012 19:20:30 +0000 (11:20 -0800)
* commit 'f815dc4e4a09ec53f183a391495ef87dd21ccc6f':


Trivial merge