OSDN Git Service

am 520b7ee0: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 22:57:52 +0000 (14:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Dec 2011 22:57:52 +0000 (14:57 -0800)
commit57129a21e1865bb44ea4c4a93f75ed996c9b2764
tree9a9557c5ba8f66d58e44d9646cf3ad75a4fcbf09
parent6ff9167388b26ea67cad4497ddd2cf42e882b928
parent520b7ee0f0f3e0b1e2424f64a0c0912d4c19bf19
am 520b7ee0: Reconcile with ics-mr1-release

* commit '520b7ee0f0f3e0b1e2424f64a0c0912d4c19bf19':