Commits
Justin Ho authored and Android Git Automerger committed 9edb26ea551M
am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1 * commit '043c5f8f1d9a8e9077e1c16af28509b30f00324d': Cherry-picking Id45abeba and Ia065dec6 for MR1
Showing diff tof5ed1d4c553