tree 957895c655caba36a3bdcb17487395680a97cd31
parent cb5226ad9066f2dd0f8454922d766bde87b467bc
parent 8ba8c919fe49669160c10eb874dc4c4f1b1848e0
author Daichi Hirono <hirono@google.com> 1434420162 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434420162 +0000

am 8ba8c919: am 4e3fb992: am 100e1c92: Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev

* commit '8ba8c919fe49669160c10eb874dc4c4f1b1848e0':
  Fix API doc of MtpDevice#getObjectHandles.