OSDN Git Service

am 1bd8111b: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:21:31 +0000 (10:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Feb 2012 18:21:31 +0000 (10:21 -0800)
commit652e8ffe1386e39d6cfbfc7696d5f1eb443caf45
tree62ae95e5606b65456e4877a437dfcb3020b7cee1
parentfe9a8650ccbc4bf76117dda6d2af3838172dd29d
parent9930f484d0b59a3a0f4de5b909939fadb6d44e89
am 1bd8111b: Reconcile with ics-mr1-release

* commit '1bd8111bbc62278d5025de8ba5e3418b7477d8a2':