Commits
Scott Main authored and Android Git Automerger committed b45b39a2630M
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 'cdf3455c502891683eaa242a14e413ff947dabe3': 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 tofefff422556