tree e8c952c189aed1ecf12339e8ae2211ebcd60f070
parent 8c1d1b3edff299ca6ef5739e044343b7f2c57f73
parent 57394e3daff094c28ee2a2fb886e1764a1b7728d
author kmccormick <kmccormick@google.com> 1370482343 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370482343 -0700

am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs

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