Commits
Robert Ly authored and Android Git Automerger committed 4e400158991M
am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a * commit '1e4cf2dddbac4d357731ffaf02c4402426aa3763': cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Showing diff to22f4e8f627e