tree 3f9e36077d4fc4476ee07074f8c5cbfa9e39c58f
parent 237f4c9f814f0c9db3e00e445f20c77791138f86
parent 84eff01b333f08d57fbfaf1842f50c757990dc81
author The Android Open Source Project <initial-contribution@android.com> 1320256368 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1320256369 -0700

Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001