OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 10 Nov 2011 22:53:50 +0000 (14:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 10 Nov 2011 22:53:51 +0000 (14:53 -0800)
commit4977479ecb0f3b69017aba22e0bd850c54aa5bbb
treebee76d751997b309e454f8c4c5b2686034b6571c
parent7cad0b48243f86c516181d09185dc83223ae51d7
parentd7292d5796d9ae1f288a0273ec54f8041536a536
Reconcile with ics-mr1-release

Change-Id: I86cac837a23dff6367af0e69d07ad3983845ff1e