tree 780a0794ca89d2a7fc5fea86683686dcc6d69bd3
parent 0c8a7768e04513f5175add42c7be6240a703ff73
parent f1d4dc3844510eb02cffd49c81ce2ec297758a6f
author Scott Main <smain@google.com> 1343280234 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343280234 -0700

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

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