Commits
Scott Main authored and Android Git Automerger committed 5527a78be7aM
am 07b9b3ad: am b45b39a2: am cdf3455c: am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later." * commit '07b9b3ad3b4d942b4ed920cfa8f68bce71686972': Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
Showing diff to613bc5c4879