tree 96d064b41c6158f9a4029e33ea8009752add5065
parent fb1e20dfe2a1252625ea59d4fd5ad4601b118d68
parent 0d4adbe0a3ba69ddc348cf086b2357cf27ff10d6
author Dirk Dougherty <ddougherty@google.com> 1372052165 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372052165 -0700

am 0d4adbe0: am 0efa541a: am 6561c275: am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in.

* commit '0d4adbe0a3ba69ddc348cf086b2357cf27ff10d6':
  Doc change: add docs for edu opt-in.