tree 2847949f8bc9111a84704c12bd64ebc1ee2ced97
parent e4618064e8f4d5975021c09ec0f7b180eb3818e5
parent 413075099d724c35781e4f6ac3f71fd0bf474ab5
author Chris Wren <cwren@android.com> 1392411283 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411283 +0000

am 41307509: am f6a22ada: Add auto-detection of payload type

* commit '413075099d724c35781e4f6ac3f71fd0bf474ab5':
  Add auto-detection of payload type