OSDN Git Service

Reconcile with ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 1 Nov 2011 17:08:00 +0000 (10:08 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 1 Nov 2011 17:08:00 +0000 (10:08 -0700)
commit5b85b1900c9b58db7642db2d189766767fc259be
treee6a637bc7cf2d9ccbc0156a0d15ba9cbaef4f29e
parentdb6281e8bb5e258c8841c162ee9f34660912b13d
parentd8e44bce6f47ccdad3b3ca5004dc088c14bd735e
Reconcile with ics-factoryrom-2-release

Change-Id: I5488896eaf252e88fd0a7c8052c1e27be3f91e6f