Commits
Justin Ho authored and Android Git Automerger committed 3299ad52545M
am 9edb26ea: am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1 * commit '9edb26ea551bec24fa417a854ecec3801f15dc1d': Cherry-picking Id45abeba and Ia065dec6 for MR1
Showing diff to931310f1d21