OSDN Git Service

am 9ae0b5a2: am b2a0ea35: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Mar 2012 00:46:23 +0000 (16:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 Mar 2012 00:46:23 +0000 (16:46 -0800)
commitbb826f26cb36261b06e218a0c76e3bc6d518314f
tree81c84e202f8e788708fe7671a5ffaa71af5b1f31
parent5974ff9d03a558fa923fa63484baaeccfd99d53d
parent9ae0b5a23d8bc010589e77d29926b55903f3a31e
am 9ae0b5a2: am b2a0ea35: Reconcile with ics-mr1-release

* commit '9ae0b5a23d8bc010589e77d29926b55903f3a31e':