tree 10d0326ac981f6fefd1b90f08d0d94b2c83d0d70
parent e1070928795210a1894a454ff88e9d529ca381a7
parent 76b66a9ae7a894dd30a3bab56dedb537a904157b
author Katie McCormick <kmccormick@google.com> 1397586867 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397586867 +0000

am 76b66a9a: am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs

* commit '76b66a9ae7a894dd30a3bab56dedb537a904157b':
  Doc change: Update CCS doc with new quota info.