OSDN Git Service

am 31856263: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Jan 2012 23:52:22 +0000 (15:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Jan 2012 23:52:22 +0000 (15:52 -0800)
commit2484f1848176c2f6244c58837be05f5484baa4d8
tree1984d5e63c0c437db613bc4c846256790371d313
parent49a49d2fd7c1f899012cd276f9263e2643652458
parent318562634a59d1c027dae121799fe6b1b9984500
am 31856263: Reconcile with ics-mr1-release

* commit '318562634a59d1c027dae121799fe6b1b9984500':