OSDN Git Service

am 16bdd1e6: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 03:13:18 +0000 (19:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Dec 2011 03:13:18 +0000 (19:13 -0800)
commit5805f995ef365bf00fcccd5c1f948086c17ec75e
treeed289e8d756105114a04b35dbef3c027454f49f7
parentf4ebe8bdfa7e94d7613a4acfc1fb5f6c747bebd3
parent50845c903200fbf5e1e61012376516931e945e4c
am 16bdd1e6: Reconcile with ics-mr1-release

* commit '16bdd1e65ef19379bbede40c38de2e9f816ba35b':