tree 869389e783793853c1c763556cbf52c4fa0f16bf
parent ec8d1280ac70245dcc533054b748f794f33f85bd
parent f2e28abb1375c5ca513eac9dcde5c349f771de0f
author Romain Guy <romainguy@google.com> 1350336140 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350336140 -0700

am f2e28abb: Merge "Update javadoc" into jb-mr1-dev

* commit 'f2e28abb1375c5ca513eac9dcde5c349f771de0f':
  Update javadoc