OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Feb 2012 23:36:28 +0000 (15:36 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Feb 2012 23:36:28 +0000 (15:36 -0800)
commitd0d7086fb6012b72731fcefeabe92edccaaf89eb
treecb5a7174747aedb658f5e270d9b473fb5e5fb90f
parent96859329d3f9a7a1c9834810e16747e205ea16c7
parentc7887ba1981d6b736c512fdb6ef189a5ff1dd504
Reconcile with ics-mr1-release

Change-Id: Ie9e79a16a3541f85ef9d1a7ffd4fe470c3570a16