Commits
Robert Greenwalt authored and Android Git Automerger committed d671cdd7e27M
am 84aa999e: am 2cb7db11: resolved conflicts for merge of 41508f05 to jb-dev-plus-aosp * commit '84aa999ed202b3f2fc6fbf5cd39d66dad1af1ed3': Fix a logging NPE problem
Showing diff to8502ab91bdd