tree 2847949f8bc9111a84704c12bd64ebc1ee2ced97
parent 6b3ce791a49d152b7d740569e1b6834c9bf4ca96
parent 76fffaeaa2963b9cd777f49ce297ef1d0760cd15
author Chris Wren <cwren@android.com> 1392411760 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411760 +0000

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

* commit '76fffaeaa2963b9cd777f49ce297ef1d0760cd15':
  Add auto-detection of payload type