tree e917b251d7ebacd20376274ce01318427f656b2b
parent cdc70256f47b1797520f2bb5c63b21bd441ed8d9
parent 6e208cddad3315c4e38accdb801908b2b9b5cbbd
author Narayan Kamath <narayan@google.com> 1424772712 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424772712 +0000

am 6e208cdd: Merge "Remove wrong javadoc comment"

* commit '6e208cddad3315c4e38accdb801908b2b9b5cbbd':
  Remove wrong javadoc comment