am 9edb26ea: am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1

* commit '9edb26ea551bec24fa417a854ecec3801f15dc1d':
  Cherry-picking Id45abeba and Ia065dec6 for MR1
This commit is contained in:
Justin Ho 2011-12-16 11:56:19 -08:00 committed by Android Git Automerger
commit 01da3368d8

Diff Content Not Available