OSDN Git Service

Reconcile with ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Nov 2011 14:57:21 +0000 (07:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Nov 2011 14:57:21 +0000 (07:57 -0700)
commit0ad13892c6a0a1d86e0b7dbafd3d4a2c7c82c8d2
treeb4cbb3fec68965b5f86b87f704b9bb33185e8e51
parentf53c3602f92d623f03e941c1d590a4720578cf5e
parent850cb95af3949ca7967deea104844c800f7d4b62
Reconcile with ics-factoryrom-2-release

Change-Id: I1b9c07a111d23bd863d4beb0a31a2ab949e9eae7