tree 86259a61edd9781c0ecbfade68f69714c7d8de5e
parent 3adb34ee079504b5854d23bc7a38dafc0a985219
parent d057fa6d40198e07844f702608b7959bad3bd48b
author Ricardo Cervera <rcervera@google.com> 1391721201 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391721201 +0000

am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs

* commit 'd057fa6d40198e07844f702608b7959bad3bd48b':
  docs: Fixed links to Proguard manual. Bug: 12713887