tree a70dbe8c304dd6584682db569558fa7a25f4eb6d
parent 2cc08949923f666d6d71e329871234b6c2154384
parent efcf8893a97df2eb2ecb7aab305998878771d2f2
author Mike Lockwood <lockwood@google.com> 1335471174 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335471174 -0700

am efcf8893: Merge "Update f_accessory.h kernel header" into jb-dev

* commit 'efcf8893a97df2eb2ecb7aab305998878771d2f2':
  Update f_accessory.h kernel header