Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Nov 2011 19:09:23 +0000 (11:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Nov 2011 19:09:23 +0000 (11:09 -0800)
commitb82aae8175168c7841e831d491a1c9aba50199cd
tree05df0c2581a48f5efc8c5fabfbffc3feb13f553b
parent3c86a5424fa4a0099d66172ff8b0a00eda9fd528
parent3ec37ec7e2d9fb98631ed0365c82b8829c943219
Reconcile with ics-mr0-release

Change-Id: Iba27b8721747eb385654bcacca3fa9520af8e26b