OSDN Git Service

am c9024703: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:19:45 +0000 (10:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Feb 2012 18:19:45 +0000 (10:19 -0800)
commit935bd0f4edc903dec49544a9a764f836bba482d1
tree1ac8d25a8af8c082c7d123ee1da3396f5289844d
parent97e4394902cd19219dfef7b5e20d7570b1f6ebd8
parentc902470310404e42aeb93fca38694b374371e0de
am c9024703: Reconcile with ics-mr1-release

* commit 'c902470310404e42aeb93fca38694b374371e0de':