OSDN Git Service

am 17654593: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 15:26:54 +0000 (08:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 21 Mar 2012 15:26:54 +0000 (08:26 -0700)
commitd7a9ff6ddc2895d298598e53cf7b967742e0d4da
tree147093a73e7177b761c04c70fa999e44e607a5dc
parente1176866629c90bc1403926186bf2b7efc736a2a
parent176545930d60a366734bbf70c3b60332a606c01e
am 17654593: Reconcile with ics-mr1-release

* commit '176545930d60a366734bbf70c3b60332a606c01e':