OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Oct 2011 14:30:03 +0000 (07:30 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 25 Oct 2011 14:30:03 +0000 (07:30 -0700)
commit958e00db87e8b6efea12df62a5634d99583ff8eb
tree6c428da019aa22032143cba713398cc87712dbaa
parentf4ce9fa2993a51a8813779a21ccae1e102078239
parent2db8a9821d55fa6e60a2eab7a8e3370f8fc4ab96
Reconcile with ics-mr0-release

Change-Id: Ibce8b7257faf1e0fbd89e9132b3eede5bfd07405