tree edec228ae4680d14be9300f05b09954118745374
parent 5f9d680dd73b437e1e311f11f255b659ad18135b
parent bf29d697803e3fe0bcb450d2e5b36d0a75cc1148
author Quddus Chong <quddusc@google.com> 1412725056 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412725056 +0000

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

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