tree afc381b262b8b7afab4cb1ff2825eea2ed30084f
parent 2a5148c5d887f5864a993650efd79bbac3d254f5
parent 219ee4a037d5ffb9a0e1c517a737d03aaaccc0c9
author Ficus Kirkpatrick <ficus@android.com> 1413819245 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413819245 +0000

am 219ee4a0: am 1b485808: Merge "Clarify javadocs for getBody() and getBodyContentType()."

* commit '219ee4a037d5ffb9a0e1c517a737d03aaaccc0c9':
  Clarify javadocs for getBody() and getBodyContentType().