OSDN Git Service

am 96859329: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Feb 2012 23:15:26 +0000 (15:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 Feb 2012 23:15:26 +0000 (15:15 -0800)
* commit '96859329d3f9a7a1c9834810e16747e205ea16c7':


Trivial merge