OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Dec 2011 21:08:24 +0000 (13:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Dec 2011 21:08:24 +0000 (13:08 -0800)
commitb08c5647a42d07d905823ccf2a88a3a8051af006
tree748fef08cf3896188b6e5f6a7d43fce92cb048e5
parentb056d71f79b717fb36d375e48c19509900f977d3
parente521822eb278a53d6aff80b18940dbf6691446f7
Reconcile with ics-mr1-release

Change-Id: I3624715f06ac682520676b2e6d45a29e1d20b1d9