OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:55 +0000 (16:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:55 +0000 (16:05 -0800)
commitb6331c31fede2d6a898892bdf9e9b34618da9756
tree3f77f052986e5e1c54dc2dddc280c05af7b8ada7
parent9e5e0ce62e88ddf9a09798eda51b0c270d354c8e
parent8a12dd0851cc2aaa1f6ffb27e5d7616733200c36
Reconcile with ics-mr1-release

Change-Id: I95c0b924756d815c89e70c088b6e8003a54226f8