tree 5a442df9219374c384a931f0c481f15f8b0dc354
parent bc382d06d987f7b77daba4d5a4579cc0dc2fe1c0
parent 1878d08046784517d3eedd47993e4a4f8c9a98bd
author Robert Ly <robertly@google.com> 1362517385 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517385 -0800

am 1878d080: am 7cbf2bc6: Merge "docs: gms cheddar updates for g+" into jb-mr1-dev

* commit '1878d08046784517d3eedd47993e4a4f8c9a98bd':