tree 5a21823c0312082613eee65a92cf99b2e7e8da30
parent b4266f54ded1de5c8aa5b4c29153e120d80d16f4
parent bb416084539804a77483ebe5ff41498b46d43cb3
author Robert Ly <robertly@google.com> 1362517765 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517765 -0800

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

* commit 'bb416084539804a77483ebe5ff41498b46d43cb3':