tree ea06bec7957a60088c79c1a852fba78c984b0f15
parent f4b21585304781c61d00fa6a14a85fae60f6a50d
parent db3158ead35f28ea31a7b6d87c50108cf972a9c0
author kmccormick <kmccormick@google.com> 1370481912 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370481912 -0700

am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs

* commit 'db3158ead35f28ea31a7b6d87c50108cf972a9c0':
  Doc update: Refactoring to client/server.