tree 6b61a975f3d2f91ea575b599499a52188add39d8
parent 6f65b6ee71f566a8c35374f95a280f65b4c08d07
parent 70b43e4fefbd3aa2e9fda9b10cc01e831d6ce94e
author Scott Main <smain@google.com> 1343282740 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343282740 -0700

am 70b43e4f: am f1d4dc38: am db242310: Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev

* commit '70b43e4fefbd3aa2e9fda9b10cc01e831d6ce94e':
  docs: add Settings dev guide; a few changes to javadocs