tree 466a843d88ec156e6bcfc37d0e72f918b28bf11b
parent ce861ff3497c28bbddc40ee2232927c2fa3ab489
parent 045bede816c6578379911567f68046393f70247c
author Robert Ly <robertly@google.com> 1361858899 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361858899 -0800

am 045bede8: am 4240da1a: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev

* commit '045bede816c6578379911567f68046393f70247c':
  docs: gms cheddar updates for g+