tree a4704ae7b0179f2660dea9c3ae622c7084c3aa97
parent 2b7b4d0742476dc71f3b53fc7d473938f27d2f1e
parent bb5a18487285455131b88caf4a40726f0e4b444c
author Quddus Chong <quddusc@google.com> 1412725766 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412725766 +0000

am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs

* commit 'bb5a18487285455131b88caf4a40726f0e4b444c':
  docs: Added API highlights for Google Play services 6.1 (Manchego).