tree 106da180718e0ba4edcaeb70c824a1c77660c656
parent 9885af055816abebfbcf1ed5e06d4c738f7ec501
parent bd2b531359d7402b742c4a126ff1c0782107ab79
author Scott Main <smain@google.com> 1352826821 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352826821 -0800

am bd2b5313: Merge "docs: edits" into jb-mr1-dev

* commit 'bd2b531359d7402b742c4a126ff1c0782107ab79':
  docs: edits