Commits
Scott Main authored and Android Git Automerger committed 0e1bb8d3c02M
am 61fa1fa8: am 70b43e4f: am f1d4dc38: am db242310: Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev * commit '61fa1fa8654ce814b29d5f63889fa497d212af4c':
Showing diff to063772d47f4