OSDN Git Service

am da296533: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Dec 2011 13:40:57 +0000 (05:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Dec 2011 13:40:57 +0000 (05:40 -0800)
commit6d3deeede48d298f95643a98e0bb8636bfbe906e
treeed289e8d756105114a04b35dbef3c027454f49f7
parent25b1e93b052ed3590c1ee4d03476c242187de36b
parentdf4856c3e34231ba0998814cd1c4d9e33dd929b6
am da296533: Reconcile with ics-mr1-release

* commit 'da29653305f299d6390492333a6360cfa78665d9':