OSDN Git Service

am aa5bdb1a: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:13:54 +0000 (10:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Feb 2012 18:13:54 +0000 (10:13 -0800)
commit09528ef10279f3893210ebcebb7a099e58c6c965
treee51943ff5fca9fb0c0d1d7a6cb23ed8f184b1463
parentbe493ca826bf56324aef42fbdbda0912539c9a3e
parentaa5bdb1afac03ece211f0375372fcc7d35e4fbbd
am aa5bdb1a: Reconcile with ics-mr1-release

* commit 'aa5bdb1afac03ece211f0375372fcc7d35e4fbbd':