OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 15:59:17 +0000 (07:59 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 15:59:17 +0000 (07:59 -0800)
commit956a9787cfaf429f951549df6e587c6ce4ac20f8
tree9923d2dba8b8bf93adb3e4a54aa8788031f6c75b
parent2a82a3a8824904f4e6750eb18dcc33ed113edbeb
parent7e2afc451825028bdeb43e60450a730a4290dfd8
Reconcile with ics-mr1-release

Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3