tree 2ab1b5eeea52f6a175b0d11c2909ed1fdd0b3485
parent aa837dedf85eabde76cf8d5ec57e42f78832e8a6
parent 6561c27519d710e79a7b2d15e29fcccb2f714c94
author Dirk Dougherty <ddougherty@google.com> 1372042232 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372042232 -0700

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

* commit '6561c27519d710e79a7b2d15e29fcccb2f714c94':
  Doc change: add docs for edu opt-in.