OSDN Git Service

am a4ea7a8f: am c30fdda0: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 Feb 2012 15:29:06 +0000 (07:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Feb 2012 15:29:06 +0000 (07:29 -0800)
* commit 'a4ea7a8f204890aee9a50d2e65b410bb443b7149':


Trivial merge