tree df29c0baa29ec5b46a39187d23cc1f9781bf798c
parent 68e0d185f4640a8e1dc7b6d1aad17b51a802de37
parent 61b4b8095a4de1e4d8ea27f860c32ea345b37bfa
author Elliott Hughes <enh@google.com> 1409330464 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409330464 +0000

am 61b4b809: am d1d11fcb: Merge "Build the optional \'r\' tool separately."

* commit '61b4b8095a4de1e4d8ea27f860c32ea345b37bfa':
  Build the optional 'r' tool separately.