tree bbacf657d902182d3b4c7f73213f365d68f0d01f
parent e0b3f3e106d5b0b9eb31ed3bd43c8a536eb8d1ee
parent 57449569b7290c56f823e90bbfa1281e982ae5f5
author Dirk Dougherty <ddougherty@google.com> 1383068678 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383068678 -0700

am 57449569: am 3bdf60dc: Merge "Doc change: Add update ProGuard keep rules for Google Play Services." into klp-dev

* commit '57449569b7290c56f823e90bbfa1281e982ae5f5':
  Doc change: Add update ProGuard keep rules for Google Play Services.