tree fc38678ab4ac738cd00cd6582fad864e7d3ae553
parent 2f7eb121302ea3638dc9b67ab8e1823f429f3231
parent 0e4e61f1d5e375932552218fb871988a3231d421
author Robert Ly <robertly@google.com> 1362517576 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517576 -0800

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

* commit '0e4e61f1d5e375932552218fb871988a3231d421':