tree e5670652c9f49f71f03f0f2c5d0529413039c38e
parent fb7044598bf017783fbc4d86ef5a7350116b0650
parent cdd271d421136593553e3c32aa4b98fc4f5268f3
author kmccormick <kmccormick@google.com> 1370482598 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370482598 -0700

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

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