tree 905cd4bf93e407915661ec2dee0657604918f0b6
parent 2c871d2cce8e926c5300fdee33526eeb5e81810c
parent a80fc040ea814af2a1d3f2cbfa5efb8eaa898697
author Dirk Dougherty <ddougherty@google.com> 1428986007 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428986007 +0000

am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs

* commit 'a80fc040ea814af2a1d3f2cbfa5efb8eaa898697':
  Doc change: add new pages for Designed for Families.