tree 5c28a535d54dc38b1639909856be24d80e63a703
parent 4db9c8935df6347e54aa9581f019a802d2ec7dad
parent cad5ce81adb28e131f2521fa5e553e222e0a19f4
author Christopher Ferris <cferris@google.com> 1422307315 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422307315 +0000

am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"

* commit 'cad5ce81adb28e131f2521fa5e553e222e0a19f4':
  adbd: Support for new f_fs descriptor format