tree 39d5d2ef0a1f0e085cfb6dbc413bae95dfeda1fa
parent 50d7bfd8224f9da170dac668888bcf0831373051
parent 2b4d89b7dcea13140b64e887b2a36042e8d491e9
author Katie McCormick <kmccormick@google.com> 1397586539 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397586539 +0000

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

* commit '2b4d89b7dcea13140b64e887b2a36042e8d491e9':
  Doc change: Update CCS doc with new quota info.