OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:06:50 +0000 (13:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:06:50 +0000 (13:06 -0800)
commit90a607163f793b968d96295b876532e4d03b642c
tree2adc30973b7511fa56436596aca516f51a6ad4b3
parent9e5af59badab79128c03c79534a20f09b6e93cfe
parente4b8fa11add55107ec74d7df7c4fe6b57a7f301e
Reconcile with ics-mr1-release

Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b