OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:26:01 +0000 (10:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:26:01 +0000 (10:26 -0800)
commita961c06b9c0718406a72d71125aa0bf45d3c8659
treebdb548ee859258e9b266ec7189d8f42b9a358330
parent325c912ae64e9559cf2e84d5c94d81a0e8a15c48
parent009c1cc19e4254a4a6c923a981ea671d458317c5
Reconcile with ics-mr0-release

Change-Id: I0924e5f898c11034b62b991876bac7e53dd0eebc