tree 65c4454e3ecb7cc576196ef1add8e33e2f49fed6
parent 25221488e846aee71c3c981b78024c8a6bd8e8d9
parent 90a542486777c4ef8faed765628fe4d182276f44
author Quddus Chong <quddusc@google.com> 1412745862 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412745862 +0000

am 90a54248: am 2b7b4d07: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs

* commit '90a542486777c4ef8faed765628fe4d182276f44':
  Updataed Google Play services Javadocs for v6.1 (Manchego) release.